From 164bae2439d490f5cc93e1068692d42d56d36b76 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 22 Oct 2018 15:39:03 -0500
Subject: TRILAB-36 add option for test script batch command

---
 config/cmake/scripts/CTestScript.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 ()
-- 
cgit v0.12


From 096279caf76a542306b840fb90e1e753e8bbf748 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 22 Oct 2018 16:08:52 -0500
Subject: HDFFV-10608 Move toolchain files into a subfolder

---
 MANIFEST                                 |  4 ++--
 config/GCC.cmake                         | 10 ----------
 config/cmake/UserMacros/Windows_MT.cmake |  3 ++-
 config/cmake/scripts/HDF5options.cmake   |  2 +-
 config/intel.cmake                       | 10 ----------
 config/toolchain/GCC.cmake               | 10 ++++++++++
 config/toolchain/intel.cmake             | 10 ++++++++++
 7 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 config/GCC.cmake
 delete mode 100644 config/intel.cmake
 create mode 100644 config/toolchain/GCC.cmake
 create mode 100644 config/toolchain/intel.cmake

diff --git a/MANIFEST b/MANIFEST
index a7df90c..d32e04d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -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/GCC.cmake b/config/GCC.cmake
deleted file mode 100644
index ddb1641..0000000
--- a/config/GCC.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_COMPILER_VENDOR "GCC")
-
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_CXX_COMPILER c++)
-set(CMAKE_Fortran_COMPILER gfortran)
-
-# the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
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/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/intel.cmake b/config/intel.cmake
deleted file mode 100644
index f1a5734..0000000
--- a/config/intel.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_COMPILER_VENDOR "intel")
-
-set(CMAKE_C_COMPILER icc)
-set(CMAKE_CXX_COMPILER icpc)
-set(CMAKE_Fortran_COMPILER ifort)
-
-# the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/GCC.cmake b/config/toolchain/GCC.cmake
new file mode 100644
index 0000000..ddb1641
--- /dev/null
+++ b/config/toolchain/GCC.cmake
@@ -0,0 +1,10 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_COMPILER_VENDOR "GCC")
+
+set(CMAKE_C_COMPILER cc)
+set(CMAKE_CXX_COMPILER c++)
+set(CMAKE_Fortran_COMPILER gfortran)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/intel.cmake b/config/toolchain/intel.cmake
new file mode 100644
index 0000000..f1a5734
--- /dev/null
+++ b/config/toolchain/intel.cmake
@@ -0,0 +1,10 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_COMPILER_VENDOR "intel")
+
+set(CMAKE_C_COMPILER icc)
+set(CMAKE_CXX_COMPILER icpc)
+set(CMAKE_Fortran_COMPILER ifort)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
-- 
cgit v0.12