diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-09-26 13:47:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 13:47:33 (GMT) |
| commit | 8235132a26fb771dbe0158e1df7dee549bdcd7a2 (patch) | |
| tree | 1125598290057ac59b90ce25dc11240bede7a5d6 /config/cmake | |
| parent | 9c2ce0a5c88f564ae5d8f0c5a2590a1577a2eda7 (diff) | |
| download | hdf5-8235132a26fb771dbe0158e1df7dee549bdcd7a2.zip hdf5-8235132a26fb771dbe0158e1df7dee549bdcd7a2.tar.gz hdf5-8235132a26fb771dbe0158e1df7dee549bdcd7a2.tar.bz2 | |
Sync CMake and doxygen (#3593)
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/fileCompareTest.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.in | 5 | ||||
| -rw-r--r-- | config/cmake/patch.xml.in (renamed from config/cmake/patch.xml) | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake index 18a29d9..5cd56ee 100644 --- 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 index fa5bfcb..e5bd240 100644 --- 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 b/config/cmake/patch.xml.in index 1bdff3e..d6843e1 100644 --- a/config/cmake/patch.xml +++ b/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]" |