Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync CMake and doxygen #3593

Merged
merged 2 commits into from
Sep 26, 2023
Merged

Sync CMake and doxygen #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a8e52
Sync CMake and doxygen
byrnHDF Sep 25, 2023
82ea25c
Spelling
byrnHDF Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CMakeInstallation.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/fileCompareTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
5 changes: 3 additions & 2 deletions config/cmake/hdf5-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ()
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/patch.xml → config/cmake/patch.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]"
Expand Down
2 changes: 1 addition & 1 deletion config/sanitizer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES
)

cmake_format(TARGET_NAME ${CMAKE_FILES})
```
```
2 changes: 1 addition & 1 deletion config/toolchain/build32.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
16 changes: 8 additions & 8 deletions config/toolchain/clang.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
10 changes: 5 additions & 5 deletions config/toolchain/crayle.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
12 changes: 6 additions & 6 deletions config/toolchain/gcc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
2 changes: 1 addition & 1 deletion config/toolchain/mingw64.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
12 changes: 6 additions & 6 deletions config/toolchain/pgi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
Loading