summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2015-10-20 21:09:27 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2015-10-20 21:09:27 (GMT)
commit84c4dc0039642804ab7f130a3e0f2d756b670a86 (patch)
tree81e4f096a78ba17e42e855854c3acf8aa1d2aa20
parent1bf086b0808593fa07e8cd9d18ad3d96a8da9439 (diff)
downloadhdf5-84c4dc0039642804ab7f130a3e0f2d756b670a86.zip
hdf5-84c4dc0039642804ab7f130a3e0f2d756b670a86.tar.gz
hdf5-84c4dc0039642804ab7f130a3e0f2d756b670a86.tar.bz2
[svn-r28147] Correct define vs variable usage
-rwxr-xr-xconfig/cmake/scripts/CTestScript.cmake2
-rwxr-xr-xconfig/cmake/scripts/HDF518config.cmake2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index d7c777d..403eedd 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -255,6 +255,8 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
if(LOCAL_UPDATE)
ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")
endif()
+ configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+ ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}")
if(LOCAL_SUBMIT)
ctest_submit (PARTS Update Configure Notes)
diff --git a/config/cmake/scripts/HDF518config.cmake b/config/cmake/scripts/HDF518config.cmake
index 2e16831..7c18e86 100755
--- a/config/cmake/scripts/HDF518config.cmake
+++ b/config/cmake/scripts/HDF518config.cmake
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
# INSTALLDIR - root folder where hdf5 is installed
# CTEST_BUILD_CONFIGURATION - Release, Debug, etc
# CTEST_SOURCE_NAME - source folder
-# STATICLIBRARIES - Build/use static libraries
+# STATIC_LIBRARIES - Build/use static libraries
# NO_MAC_FORTRAN - Yes to be SHARED on a Mac
##############################################################################