Skip to content

Commit

Permalink
CMake Package: support building ~ownlibs on Windows (spack#38758)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnwparent authored Nov 13, 2023
1 parent 388f141 commit 8bcc3e2
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions var/spack/repos/builtin/packages/cmake/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Cmake(Package):
url = "https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0.tar.gz"
git = "https://gitlab.kitware.com/cmake/cmake.git"

maintainers("alalazo")
maintainers("alalazo", "johnwparent")

tags = ["build-tools", "windows"]

Expand Down Expand Up @@ -234,23 +234,22 @@ class Cmake(Package):
with when("~ownlibs"):
depends_on("expat")
# expat/zlib are used in CMake/CTest, so why not require them in libarchive.
depends_on("[email protected]: xar=expat compression=zlib")
depends_on("[email protected]:", when="@3.15.0:")
depends_on("[email protected]:1.10", when="@3.7.0:3.10.3")
depends_on("[email protected]:1.10", when="@3.11.0:3.11")
depends_on("[email protected]:", when="@3.12.0:")
depends_on("rhash", when="@3.8.0:")
depends_on("jsoncpp build_system=meson", when="@3.2:")
for plat in ["darwin", "cray", "linux"]:
with when("platform=%s" % plat):
depends_on("[email protected]: xar=expat compression=zlib")
depends_on("[email protected]:", when="@3.15.0:")
depends_on("[email protected]:1.10", when="@3.7.0:3.10.3")
depends_on("[email protected]:1.10", when="@3.11.0:3.11")
depends_on("[email protected]:", when="@3.12.0:")
depends_on("rhash", when="@3.8.0:")
depends_on("jsoncpp build_system=meson", when="@3.2:")

depends_on("ncurses", when="+ncurses")

with when("+doc"):
depends_on("[email protected]:", type="build")
depends_on("py-sphinx", type="build")

# TODO: update curl package to build with Windows SSL implementation
# at which point we can build with +ownlibs on Windows
conflicts("~ownlibs", when="platform=windows")
# Cannot build with Intel, should be fixed in 3.6.2
# https://gitlab.kitware.com/cmake/cmake/issues/16226
patch("intel-c-gnu11.patch", when="@3.6.0:3.6.1")
Expand Down

0 comments on commit 8bcc3e2

Please sign in to comment.