zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Cray XC40 system errors bootstrapping CMake (#16459)

Browse Source 
* CMake: fix https://github.com/spack/spack/issues/16453 with a patch addressing both libhugetlbfs and icpc warnings on Cray XC40 systems

* Including CMake v3.17.2 in the patched versions
This commit is contained in:
Jennifer Green 2020-05-05 12:02:49 -06:00 committed by GitHub
parent ff3769e2e2
commit de71b2828f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/cmake/ignore_crayxc_warnings.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index fb68ed78c9..c6c1ba667f 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -17,2 +17,6 @@ function(cm_check_cxx_feature name)
set(check_output "${OUTPUT}")
+ # Filter out libhugetlbfs warnings
+ string(REGEX REPLACE "[^\n]*libhugetlbfs [^\n]*: WARNING[^\n]*" "" check_output "${check_output}")
+ # Filter out icpc warnings
+ string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding [^\n]*" "" check_output "${check_output}")
# Filter out MSBuild output that looks like a warning.

5
var/spack/repos/builtin/packages/cmake/package.py
View File

@ -132,6 +132,11 @@ class Cmake(Package):
# https://gitlab.kitware.com/cmake/cmake/issues/18232
patch('nag-response-files.patch', when='@3.7:3.12')
# Cray libhugetlbfs and icpc warnings failing CXX tests
# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4698
# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4681
patch('ignore_crayxc_warnings.patch', when='@3.7:3.17.2')
conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules
# https://gitlab.kitware.com/cmake/cmake/issues/18166