Add command to build options and check defines

3 files changed, 14 insertions, 10 deletions

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 2dfb5d9..e234057 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 MATCHES "raybsub")
+        if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "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 MATCHES "raybsub")
+          if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "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/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index bcd33df..83909b2 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -101,45 +101,48 @@ endif ()
 ###################################################################
 #########       Following describes compiler           ############
 if (NOT DEFINED HPC)
+  if (NOT DEFINED BUILD_GENERATOR)
+    message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
+  endif ()
   if (WIN32)
     set (SITE_OS_NAME "Windows")
     set (SITE_OS_VERSION "WIN7")
-    if (${BUILD_GENERATOR} STREQUAL "VS201764")
+    if (BUILD_GENERATOR STREQUAL "VS201764")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2017")
       set (SITE_COMPILER_VERSION "15")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS2017")
+    elseif (BUILD_GENERATOR STREQUAL "VS2017")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2017")
       set (SITE_COMPILER_VERSION "15")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS201564")
+    elseif (BUILD_GENERATOR STREQUAL "VS201564")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2015")
       set (SITE_COMPILER_VERSION "14")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS2015")
+    elseif (BUILD_GENERATOR STREQUAL "VS2015")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2015")
       set (SITE_COMPILER_VERSION "14")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS201364")
+    elseif (BUILD_GENERATOR STREQUAL "VS201364")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2013")
       set (SITE_COMPILER_VERSION "12")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS2013")
+    elseif (BUILD_GENERATOR STREQUAL "VS2013")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2013")
       set (SITE_COMPILER_VERSION "12")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS201264")
+    elseif (BUILD_GENERATOR STREQUAL "VS201264")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2012")
       set (SITE_COMPILER_VERSION "11")
-    elseif (${BUILD_GENERATOR} STREQUAL "VS2012")
+    elseif (BUILD_GENERATOR STREQUAL "VS2012")
       set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2012")
diff --git a/config/cmake/scripts/HPC/raybsub-HDF5options.cmake b/config/cmake/scripts/HPC/raybsub-HDF5options.cmake
index 9775979..4aad887 100644
--- a/config/cmake/scripts/HPC/raybsub-HDF5options.cmake
+++ b/config/cmake/scripts/HPC/raybsub-HDF5options.cmake
@@ -33,6 +33,7 @@ set (LOCAL_BATCH_TEST "TRUE")
 set (LOCAL_BATCH_SCRIPT_NAME "ray_ctestS.lsf")
 set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ray_ctestP.lsf")
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_COMMAND:STRING=${LOCAL_BATCH_SCRIPT_COMMAND}")
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=mpirun")