[svn-r28149] Correct define vs variable usage

2 files changed, 22 insertions, 8 deletions

diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index fee03b1..0e3b26d 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -7,14 +7,14 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
-#set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
 
 # handle input parameters to script.
 #INSTALLDIR - HDF5-1.8 root folder
 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo
 #CTEST_SOURCE_NAME - name of source folder; HDF4Examples
-#STATICLIBRARIES - Default is YES
-#NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac)
+#STATIC_LIBRARIES - Default is YES
+#FORTRAN_LIBRARIES - Default is NO
+##NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac)
 if(DEFINED CTEST_SCRIPT_ARG)
     # transform ctest script arguments of the form
     # script.ctest,var1=value1,var2=value2
@@ -38,6 +38,9 @@ endif()
 if(NOT DEFINED STATIC_LIBRARIES)
     set(STATICLIBRARIES "YES")
 endif()
+if(NOT DEFINED FORTRAN_LIBRARIES)
+    set(FORTRANLIBRARIES "NO")
+endif()
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
@@ -65,6 +68,12 @@ else(WIN32)
   set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 endif(WIN32)
+if(${FORTRANLIBRARIES})
+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
+else()
+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
+endif()
+set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/config/cmake/scripts/HDF518config.cmake b/config/cmake/scripts/HDF518config.cmake
index 5d10a98..d3a4049 100755
--- a/config/cmake/scripts/HDF518config.cmake
+++ b/config/cmake/scripts/HDF518config.cmake
@@ -28,10 +28,11 @@ set(CTEST_SOURCE_VERSION 1.8.16)
 ##############################################################################

 # handle input parameters to script.

 #BUILD_GENERATOR - which CMake generator to use, required

-#INSTALLDIR - HDF5-1.8.16 root folder

+#INSTALLDIR - HDF5-1.8 root folder

 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo

 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.16

-#STATICLIBRARIES - Default is YES

+#STATIC_LIBRARIES - Default is YES

+#FORTRAN_LIBRARIES - Default is NO

 #NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac

 if(DEFINED CTEST_SCRIPT_ARG)

     # transform ctest script arguments of the form

@@ -77,10 +78,10 @@ endif()
 if(NOT DEFINED CTEST_SOURCE_NAME)

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

 endif()

-if(NOT DEFINED STATICLIBRARIES)

+if(NOT DEFINED STATIC_LIBRARIES)

     set(STATICLIBRARIES "YES")

 endif()

-if(NOT DEFINED FORTRANLIBRARIES)

+if(NOT DEFINED FORTRAN_LIBRARIES)

     set(FORTRANLIBRARIES "NO")

 endif()

 

@@ -179,9 +180,13 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")

 ####      fortran       ####

 if(${FORTRANLIBRARIES})

-  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")

   ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN

   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")

+else()

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

+  ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")

 endif()

 

 ### disable test program builds