summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-02-14 17:20:17 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-02-14 17:20:17 (GMT)
commit2268685c08a77d2b09613bef196d6138c6adb7a1 (patch)
tree1023fa7eb2201c50f82c0fe3057aa46bc6a751d1
parent10cdff5ca45786832bf5e6c3e3408bc725464fd6 (diff)
downloadhdf5-2268685c08a77d2b09613bef196d6138c6adb7a1.zip
hdf5-2268685c08a77d2b09613bef196d6138c6adb7a1.tar.gz
hdf5-2268685c08a77d2b09613bef196d6138c6adb7a1.tar.bz2
CMake if statement correction
-rw-r--r--config/cmake/scripts/CTestScript.cmake4
-rw-r--r--src/CMakeLists.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 6958f31..2dfb5d9 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -277,7 +277,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
else ()
file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
- if (${LOCAL_BATCH_SCRIPT_COMMAND} STREQUAL "raybsub")
+ if (LOCAL_BATCH_SCRIPT_COMMAND MATCHES "raybsub")
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
else ()
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
@@ -296,7 +296,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/SerialTest.xml)
file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}.log ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}_Serial.log)
unset(result CACHE)
- if (${LOCAL_BATCH_SCRIPT_COMMAND} STREQUAL "raybsub")
+ if (LOCAL_BATCH_SCRIPT_COMMAND MATCHES "raybsub")
execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
else ()
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d77a8b..c4048e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -944,7 +944,7 @@ if (BUILD_SHARED_LIBS)
endif ()
if (LOCAL_BATCH_TEST)
- if (${LOCAL_BATCH_SCRIPT_COMMAND} STREQUAL "raybsub")
+ if (LOCAL_BATCH_SCRIPT_COMMAND MATCHES "raybsub")
configure_file (
${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_COMMAND}
${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_COMMAND} ESCAPE_QUOTES @ONLY