philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in CMake changes from develop

Browse Source
This commit is contained in:
Allen Byrne
2019-04-04 12:07:50 -05:00
parent 0f859bed9d
commit 7db14a3f2a
42 changed files with 464 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/cmake/scripts/CTestScript.cmake
View File

@@ -257,7 +257,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
# On Cray XC40, configuring fails in the Fortran section when using the craype-mic-knl module.
# When the configure phase is done with the craype-haswell module and the build phase is done
# with the craype-mic-knl module, configure succeeds and tests pass on the knl compute nodes
# for Intel, Cray, GCC and Clang compilers. If the variables aren't set or if not
# for Intel, Cray, GCC and Clang compilers. If the variables aren't set or if not
# cross compiling, the module switch will not occur.
if (CMAKE_CROSSCOMPILING AND COMPILENODE_HWCOMPILE_MODULE AND COMPUTENODE_HWCOMPILE_MODULE)
execute_process (COMMAND module switch ${COMPILENODE_HWCOMPILE_MODULE} ${COMPUTENODE_HWCOMPILE_MODULE})