diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-10-22 21:33:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-10-22 21:33:43 (GMT) |
| commit | 47f30b474bdc498c20bd6d2a0ba7e8947ab389f0 (patch) | |
| tree | f486957d11a73caa677bd335258f1abb110c2927 | |
| parent | 8a12b57483854929dd9ccbcf107dd1051c6c3a12 (diff) | |
| parent | 096279caf76a542306b840fb90e1e753e8bbf748 (diff) | |
| download | hdf5-47f30b474bdc498c20bd6d2a0ba7e8947ab389f0.zip hdf5-47f30b474bdc498c20bd6d2a0ba7e8947ab389f0.tar.gz hdf5-47f30b474bdc498c20bd6d2a0ba7e8947ab389f0.tar.bz2 | |
Merge pull request #1301 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '096279caf76a542306b840fb90e1e753e8bbf748':
HDFFV-10608 Move toolchain files into a subfolder
TRILAB-36 add option for test script batch command
| -rw-r--r-- | MANIFEST | 4 | ||||
| -rw-r--r-- | config/cmake/UserMacros/Windows_MT.cmake | 3 | ||||
| -rwxr-xr-x | config/cmake/scripts/CTestScript.cmake | 6 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 2 | ||||
| -rw-r--r-- | config/toolchain/GCC.cmake (renamed from config/GCC.cmake) | 0 | ||||
| -rw-r--r-- | config/toolchain/intel.cmake (renamed from config/intel.cmake) | 0 |
6 files changed, 10 insertions, 5 deletions
@@ -3161,8 +3161,8 @@ ./java/lib/ext/slf4j-simple-1.7.25.jar # CMake-specific Files -./config/GCC.cmake -./config/intel.cmake +./config/toolchain/GCC.cmake +./config/toolchain/intel.cmake ./config/cmake/cacheinit.cmake ./config/cmake/CMakeFindJavaCommon.cmake diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake index b6cc513..78d8277 100644 --- a/config/cmake/UserMacros/Windows_MT.cmake +++ b/config/cmake/UserMacros/Windows_MT.cmake @@ -14,7 +14,8 @@ ######################################################## # To use this option, copy both the macro and option code -# into the root UserMacros.cmake file. +# into the root UserMacros.cmake file. Then enable the option, +# using the command line add "-DBUILD_STATIC_CRT_LIBS:BOOL=ON" # OR add an include to the root UserMacros.cmake file: # INCLUDE(path_to_file/WINDOWS_MT.cmake) diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index 670196b..43cd48d 100755 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -263,7 +263,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n") if (NOT LOCAL_SKIP_TEST)
if (NOT LOCAL_MEMCHECK_TEST)
- ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
+ if (NOT LOCAL_BATCH_TEST) + ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res) + else () + execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_NAME}) + endif () if (LOCAL_SUBMIT)
ctest_submit (PARTS Test)
endif ()
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 440a3ae..629d277 100755 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -98,6 +98,6 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") ############################################################################################# ### use a toolchain file -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/intel.cmake") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake") ############################################################################################# diff --git a/config/GCC.cmake b/config/toolchain/GCC.cmake index ddb1641..ddb1641 100644 --- a/config/GCC.cmake +++ b/config/toolchain/GCC.cmake diff --git a/config/intel.cmake b/config/toolchain/intel.cmake index f1a5734..f1a5734 100644 --- a/config/intel.cmake +++ b/config/toolchain/intel.cmake |