[svn-r30314] HDFFV-9971: Change the usage of a CMake variable for the build type to the recommended variable name. Updated documentation.

2 files changed, 8 insertions, 8 deletions

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 403eedd..8a08caa 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -208,14 +208,14 @@ else(USE_AUTOTOOLS)
   if(LOCAL_MEMCHECK_TEST)

     find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

     set (CTEST_CONFIGURE_COMMAND

-        "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

+        "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

     )

   else()

     if(LOCAL_COVERAGE_TEST)

       find_program(CTEST_COVERAGE_COMMAND NAMES gcov)

     endif()

     set (CTEST_CONFIGURE_COMMAND

-        "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

+        "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""

     )

   endif()

 endif()

@@ -231,7 +231,7 @@ foreach(v
     CTEST_SOURCE_DIRECTORY

     CTEST_BINARY_DIRECTORY

     CTEST_CMAKE_GENERATOR

-    CTEST_BUILD_CONFIGURATION

+    CTEST_CONFIGURATION_TYPE

     CTEST_GIT_COMMAND

     CTEST_CHECKOUT_COMMAND

     CTEST_CONFIGURE_COMMAND

@@ -294,7 +294,7 @@ message(STATUS "Dashboard script configuration:\n${vars}\n")
     ##-----------------------------------------------

     ## Package the product

     ##-----------------------------------------------

-    execute_process(COMMAND cpack -C ${CTEST_BUILD_CONFIGURATION} -V

+    execute_process(COMMAND cpack -C ${CTEST_CONFIGURATION_TYPE} -V

       WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}

       RESULT_VARIABLE cpackResult

       OUTPUT_VARIABLE cpackLog

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 4ab9650..672026f 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 #            VS201264 * Visual Studio 11 2012 Win64

 #

 #     INSTALLDIR  -  root folder where hdf5 is installed

-#     CTEST_BUILD_CONFIGURATION  - Release, Debug, etc

+#     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc

 #     CTEST_SOURCE_NAME  -  source folder

 #     STATIC_LIBRARIES  -  Build/use static libraries

 #     FORTRAN_LIBRARIES -  Build/use fortran libraries

@@ -34,7 +34,7 @@ set(CTEST_SOURCE_VERSEXT "")
 # handle input parameters to script.

 #BUILD_GENERATOR - which CMake generator to use, required

 #INSTALLDIR - HDF5-1.10.0 root folder

-#CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo

+#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo

 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0

 #STATIC_LIBRARIES - Default is YES

 #FORTRAN_LIBRARIES - Default is NO

@@ -82,8 +82,8 @@ if(NOT DEFINED INSTALLDIR)
     set(INSTALLDIR "/usr/local/myhdf5")

   endif()

 endif()

-if(NOT DEFINED CTEST_BUILD_CONFIGURATION)

-    set(CTEST_BUILD_CONFIGURATION "Release")

+if(NOT DEFINED CTEST_CONFIGURATION_TYPE)

+    set(CTEST_CONFIGURATION_TYPE "Release")

 endif()

 if(NOT DEFINED CTEST_SOURCE_NAME)

     set(CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")