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 /config/cmake/scripts | |
| 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
Diffstat (limited to 'config/cmake/scripts')
| -rwxr-xr-x | config/cmake/scripts/CTestScript.cmake | 6 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 2 |
2 files changed, 6 insertions, 2 deletions
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") ############################################################################################# |