Update CMake usage

5 files changed, 24 insertions, 55 deletions

diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index c59b10c..a8b7bbc 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -63,13 +63,6 @@ if (APPLE)
   set (ENV{CC} "${XCODE_CC}")
   set (ENV{CXX} "${XCODE_CXX}")
 
-  if (NOT NO_MAC_FORTRAN)
-    # Shared fortran is not supported, build static
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  else ()
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
-  endif ()
-
   set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
 endif ()
 
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index a239ded..1aedda3 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -66,7 +66,7 @@ endif()
 if(NOT DEFINED CTEST_BUILD_NAME)
   set(CTEST_BUILD_NAME "examples")
 endif()
-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
@@ -88,9 +88,9 @@ else()
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 endif()
 if(${CDASH_LOCAL})
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
 endif()
-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
+set(ADD_BUILD_OPTIONS "${ADD_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/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 3cb9a5e..f826e31 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -64,13 +64,6 @@ if (APPLE)
   set (ENV{CC} "${XCODE_CC}")

   set (ENV{CXX} "${XCODE_CXX}")

 

-  if (NOT NO_MAC_FORTRAN)

-    # Shared fortran is not supported, build static

-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")

-  else ()

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

-  endif ()

-

   set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")

 endif ()

 

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 492d883..a19ad3d 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -32,9 +32,6 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 #     INSTALLDIR  -  root folder where hdf5 is installed

 #     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc

 #     CTEST_SOURCE_NAME  -  source folder

-#     STATIC_ONLY  -  Build/use static libraries

-#     FORTRAN_LIBRARIES -  Build/use fortran libraries

-#     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac

 ##############################################################################

 

 set (CTEST_SOURCE_VERSION "1.8.21")

@@ -46,9 +43,6 @@ set (CTEST_SOURCE_VERSEXT "-snap5")
 #INSTALLDIR - HDF5-1.8 root folder

 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo

 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.20

-#STATIC_ONLY - 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

@@ -68,6 +62,7 @@ endif ()
 

 ###################################################################

 ### Following Line is one of [Release, RelWithDebInfo, Debug] #####

+###        (default use command line -C value)
 set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")

 ###################################################################

 

@@ -84,16 +79,6 @@ endif ()
 if (NOT DEFINED CTEST_SOURCE_NAME)

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

 endif ()

-if (NOT DEFINED STATIC_ONLY)

-  set (STATICONLYLIBRARIES "YES")

-else ()

-  set (STATICONLYLIBRARIES "NO")

-endif ()

-if (NOT DEFINED FORTRAN_LIBRARIES)

-  set (FORTRANLIBRARIES "NO")

-else ()

-  set(FORTRANLIBRARIES "YES")

-endif ()

 

 set (CTEST_BINARY_NAME "build")

 set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")

@@ -205,28 +190,6 @@ set (REPOSITORY_BRANCH "hdf5_1_8_20")
 #set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")

 ###################################################################

 

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

-if (${STATICONLYLIBRARIES})

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

-  #########       Following describes computer           ############

-  ## following is optional to describe build                       ##

-  set (SITE_BUILDNAME_SUFFIX "STATIC")

-endif ()

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

-####      fortran       ####

-if (${FORTRANLIBRARIES})

-  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 ()

-

-### change install prefix

-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")

-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")

 

 ###################################################################

 

diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index b090434..23477ff 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -21,6 +21,26 @@
 #set(CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
 
 #############################################################################################
+####      Only build static libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
+####      Add PICC option on linux/mac       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
+
+#############################################################################################
+####      fortran enabled      ####
+#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")
+####      fortran disabled      ####
+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")
+
+#############################################################################################
+### change install prefix (default use INSTALLDIR value)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
+
+#############################################################################################
 ####      ext libraries       ####
 
 ### ext libs from tgz