summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorChristoph Junghans <junghans@lanl.gov>2019-11-26 09:29:25 -0700
committerChuck Atkins <chuck.atkins@kitware.com>2019-11-26 11:29:25 -0500
commit7d3d03dea99cace26ac7440227edf341167c3bed (patch)
treebf8dbc54004ded8511286aa6021870be6e6a83a4 /var
parent577391e62be194f8642dad5c7639dc1641190c18 (diff)
downloadspack-7d3d03dea99cace26ac7440227edf341167c3bed.tar.gz
spack-7d3d03dea99cace26ac7440227edf341167c3bed.tar.bz2
spack-7d3d03dea99cace26ac7440227edf341167c3bed.tar.xz
spack-7d3d03dea99cace26ac7440227edf341167c3bed.zip
cmake: add support for xlf and ninja (#13796)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/cmake/package.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index 40f6ad1889..dd57a80a66 100644
--- a/var/spack/repos/builtin/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -72,6 +72,10 @@ class Cmake(Package):
# See https://gitlab.kitware.com/cmake/cmake/merge_requests/2873
patch('cmake-macos-add-coreservices.patch', when='@3.11.0:3.13.3')
+ # Fix builds with XLF + Ninja generator
+ # https://gitlab.kitware.com/cmake/cmake/merge_requests/4075
+ patch('https://gitlab.kitware.com/cmake/cmake/merge_requests/4075.patch', sha256="3387faf4a71efe81c0fa17410b270ca7d352081ac88d2322df3da9bb6a6a3f2d", when="@3.15.5")
+
# We default ownlibs to true because it greatly speeds up the CMake
# build, and CMake is built frequently. Also, CMake is almost always
# a build dependency, and its libs will not interfere with others in