diff options
| author | John W. Parent <45471568+johnwparent@users.noreply.github.com> | 2023-11-13 17:26:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-13 14:26:33 -0800 |
| commit | 8bcc3e28200c6c674b20c680de87bb42fd625214 (patch) | |
| tree | 3bbc648350aeca73a34069549647011dca163841 | |
| parent | 388f141a92fe5c9562f04fb64cfd162ce551661b (diff) | |
| download | spack-8bcc3e28200c6c674b20c680de87bb42fd625214.tar.gz spack-8bcc3e28200c6c674b20c680de87bb42fd625214.tar.bz2 spack-8bcc3e28200c6c674b20c680de87bb42fd625214.tar.xz spack-8bcc3e28200c6c674b20c680de87bb42fd625214.zip | |
CMake Package: support building `~ownlibs` on Windows (#38758)
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 44f6b596aa..15eccd6d3e 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -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"] @@ -234,13 +234,15 @@ 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("libarchive@3.1.0: xar=expat compression=zlib") - depends_on("libarchive@3.3.3:", when="@3.15.0:") - depends_on("libuv@1.0.0:1.10", when="@3.7.0:3.10.3") - depends_on("libuv@1.10.0:1.10", when="@3.11.0:3.11") - depends_on("libuv@1.10.0:", 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("libarchive@3.1.0: xar=expat compression=zlib") + depends_on("libarchive@3.3.3:", when="@3.15.0:") + depends_on("libuv@1.0.0:1.10", when="@3.7.0:3.10.3") + depends_on("libuv@1.10.0:1.10", when="@3.11.0:3.11") + depends_on("libuv@1.10.0:", 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") @@ -248,9 +250,6 @@ class Cmake(Package): depends_on("python@2.7.11:", 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") |