Sync CMake and doxygen (#3593)

HDFGroup · Sep 26, 2023 · 8235132 · 8235132
1 parent 9c2ce0a
commit 8235132
Show file tree

Hide file tree

Showing 35 changed files with 1,903 additions and 38 deletions.
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
@@ -394,7 +394,13 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}")
     set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}")
     if (BUILD_SHARED_LIBS)
-      set(CPACK_WIX_PATCH_FILE "${HDF_RESOURCES_DIR}/patch.xml")
+      if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      else ()
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}")
+      endif ()
+      configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY)
+      set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml")
     endif ()
   elseif (APPLE)
     list (APPEND CPACK_GENERATOR "STGZ")

diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
@@ -66,7 +66,7 @@ else ()
     endif ()
   elseif (TEST_FUNCTION MATCHES "LTEQ")
     if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-      message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     else ()
       message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     endif ()

diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
@@ -54,6 +54,7 @@ set (${HDF5_PACKAGE_NAME}_ARCHITECTURE "@CMAKE_GENERATOR_ARCHITECTURE@")
 set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
 set (${HDF5_PACKAGE_NAME}_DEFAULT_API_VERSION "@DEFAULT_API_VERSION@")
 set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES @PARALLEL_FILTERED_WRITES@)
+set (${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN "@HDF5_INSTALL_MOD_FORTRAN@")
 
 #-----------------------------------------------------------------------------
 # Dependencies
@@ -150,14 +151,14 @@ foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
     list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
     set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
 
-    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "SHARED")
       set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/shared")
     endif ()
   elseif (comp STREQUAL "static")
     list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
     set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
 
-    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "STATIC")
       set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/static")
     endif ()
   endif ()

diff --git a/config/cmake/patch.xml → config/cmake/patch.xml.in b/config/cmake/patch.xml → config/cmake/patch.xml.in
@@ -1,5 +1,5 @@
 <CPackWiXPatch>
-    <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
+    <CPackWiXFragment Id="CM_CP_libraries.bin.@WIX_CMP_NAME@.dll">
         <Environment Id="PATH" 
              Name="PATH" 
              Value="[CM_DP_libraries.bin]" 

diff --git a/config/sanitizer/README.md b/config/sanitizer/README.md
@@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES
 )
 
 cmake_format(TARGET_NAME ${CMAKE_FILES})
-```
+```
diff --git a/config/toolchain/build32.cmake b/config/toolchain/build32.cmake
@@ -42,7 +42,7 @@ elseif(MINGW)
   set (CMAKE_CROSSCOMPILING_EMULATOR wine)
 
   include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+  set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
 else ()
   set (CMAKE_SYSTEM_NAME Linux)
 

diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
@@ -1,16 +1,16 @@
 # Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "clang")
+set (CMAKE_COMPILER_VENDOR "clang")
 
 if(WIN32)
-  set(CMAKE_C_COMPILER clang-cl)
-  set(CMAKE_CXX_COMPILER clang-cl)
+  set (CMAKE_C_COMPILER clang-cl)
+  set (CMAKE_CXX_COMPILER clang-cl)
 else()
-  set(CMAKE_C_COMPILER clang)
-  set(CMAKE_CXX_COMPILER clang++)
+  set (CMAKE_C_COMPILER clang)
+  set (CMAKE_CXX_COMPILER clang++)
 endif()
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/crayle.cmake b/config/toolchain/crayle.cmake
@@ -1,10 +1,10 @@
 # The following line will use cross-compiling
-set(CMAKE_SYSTEM_NAME Linux)
+set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
+set (CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
 
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_Fortran_COMPILER ftn)
+set (CMAKE_C_COMPILER cc)
+set (CMAKE_Fortran_COMPILER ftn)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/gcc.cmake b/config/toolchain/gcc.cmake
@@ -1,11 +1,11 @@
 # Uncomment the following line and the correct system name to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "GCC")
+set (CMAKE_COMPILER_VENDOR "GCC")
 
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_CXX_COMPILER c++)
-set(CMAKE_Fortran_COMPILER gfortran)
+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 "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
@@ -11,4 +11,4 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
 
 include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
diff --git a/config/toolchain/pgi.cmake b/config/toolchain/pgi.cmake
@@ -1,11 +1,11 @@
 # Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "PGI")
+set (CMAKE_COMPILER_VENDOR "PGI")
 
-set(CMAKE_C_COMPILER pgcc)
-set(CMAKE_CXX_COMPILER pgc++)
-set(CMAKE_Fortran_COMPILER pgf90)
+set (CMAKE_C_COMPILER pgcc)
+set (CMAKE_CXX_COMPILER pgc++)
+set (CMAKE_Fortran_COMPILER pgf90)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
-Original file line number
+Diff line change
@@ Expand Up / @@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES @@
     )
     cmake_format(TARGET_NAME ${CMAKE_FILES})
-    ```
+    ```