From b12965376a86d85edf3f466793fa6566c3bdb193 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 28 Jan 2025 12:47:37 -0600 Subject: [PATCH 1/2] Fix issue #18 by creating a link to libdf --- CMakeLists.txt | 3 ++- hdf/src/CMakeLists.txt | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 850d1d23e..d731212c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,6 +170,7 @@ set (HDF4_LIB_SYM_BASE "df") set (HDF4_MFLIB_BASE "mfhdf") set (HDF4_LIB_CORE "") +set (HDF4_LIB_SYM_CORE "") set (HDF4_MF_LIB_CORE "") set (HDF4_TEST_LIB_CORE "_test") set (HDF4_TOOLS_LIB_CORE "_tools") @@ -196,7 +197,7 @@ set (HDF4_JAVA_TEST_LIB_CORENAME "jartest4") # Set the true names of all the libraries if customized by external project #----------------------------------------------------------------------------- set (HDF4_SRC_LIB_NAME "${HDF4_EXTERNAL_LIB_PREFIX}${HDF4_LIB_BASE}${HDF4_LIB_INFIX}${HDF4_LIB_CORE}${HDF4_EXTERNAL_LIB_SUFFIX}") -set (HDF4_SRC_LIB_SYM_NAME "${HDF4_EXTERNAL_LIB_PREFIX}${HDF4_LIB_BASE}${HDF4_LIB_INFIX}${HDF4_LIB_SYM_CORE}${HDF4_EXTERNAL_LIB_SUFFIX}") +set (HDF4_SRC_LIB_SYM_NAME "${HDF4_EXTERNAL_LIB_PREFIX}${HDF4_LIB_SYM_BASE}${HDF4_LIB_INFIX}${HDF4_LIB_SYM_CORE}${HDF4_EXTERNAL_LIB_SUFFIX}") set (HDF4_SRC_FCSTUB_LIB_NAME "${HDF4_EXTERNAL_LIB_PREFIX}${HDF4_LIB_BASE}${HDF4_LIB_INFIX}${HDF4_FCSTUB_LIB_CORE}${HDF4_EXTERNAL_LIB_SUFFIX}") set (HDF4_SRC_FORTRAN_LIB_NAME "${HDF4_EXTERNAL_LIB_PREFIX}${HDF4_LIB_BASE}${HDF4_LIB_INFIX}${HDF4_FORTRAN_LIB_CORE}${HDF4_EXTERNAL_LIB_SUFFIX}") set (HDF4_MF_LIB_NAME "${HDF4_EXTERNAL_LIB_PREFIX}${HDF4_MFLIB_BASE}${HDF4_LIB_INFIX}${HDF4_MF_LIB_CORE}${HDF4_EXTERNAL_LIB_SUFFIX}") diff --git a/hdf/src/CMakeLists.txt b/hdf/src/CMakeLists.txt index e0320b6e4..031e0692c 100644 --- a/hdf/src/CMakeLists.txt +++ b/hdf/src/CMakeLists.txt @@ -146,12 +146,12 @@ if (BUILD_STATIC_LIBS) INTERFACE_INCLUDE_DIRECTORIES "$/include>" ) set (install_targets ${HDF4_SRC_LIB_TARGET}) -# add_custom_command(OUTPUT ${HDF4_SRC_LIB_TARGET} POST_BUILD -# COMMAND ${CMAKE_COMMAND} -E create_symlink $ $/$ -# DEPENDS ${HDF4_SRC_LIB_TARGET} -# ) -# install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink $ $/lib${HDF4_SRC_LIB_SYM_NAME}.a)" COMPONENT libraries) -# set (install_targets ${install_targets} ${HDF4_SRC_LIB_SYM_TARGET}) + install(CODE "execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink \"./$\" $${HDF4_SRC_LIB_SYM_NAME}$ + WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${HDF4_INSTALL_LIB_DIR} + )" + COMPONENT libraries + ) endif () if (BUILD_SHARED_LIBS) @@ -180,12 +180,12 @@ if (BUILD_SHARED_LIBS) INTERFACE_COMPILE_DEFINITIONS H4_BUILT_AS_DYNAMIC_LIB=1 ) set (install_targets ${install_targets} ${HDF4_SRC_LIBSH_TARGET}) -# -# add_custom_command(TARGET ${HDF4_SRC_LIBSH_TARGET} -# COMMAND ${CMAKE_COMMAND} -E create_symlink $ $ -# DEPENDS $ -# ) -# set (install_targets ${install_targets} ${HDF4_SRC_LIBSH_SYM_TARGET}) + install(CODE "execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink \"./$\" $${HDF4_SRC_LIB_SYM_NAME}$ + WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${HDF4_INSTALL_LIB_DIR} + )" + COMPONENT libraries + ) endif () #----------------------------------------------------------------------------- From 60aea69391939be43e4b153378d4d00d3839c5e6 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 29 Jan 2025 11:01:49 -0600 Subject: [PATCH 2/2] Use latest - fixes bug --- .github/workflows/release-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml index 8448c7294..8552fe5a3 100644 --- a/.github/workflows/release-files.yml +++ b/.github/workflows/release-files.yml @@ -214,7 +214,7 @@ jobs: - name: PreRelease tag id: create_prerelease if: ${{ (inputs.use_environ == 'snapshots') }} - uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0 + uses: softprops/action-gh-release@v2.2.1 with: tag_name: "${{ inputs.use_tag }}" prerelease: true @@ -241,7 +241,7 @@ jobs: - name: Release tag id: create_release if: ${{ (inputs.use_environ == 'release') }} - uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0 + uses: softprops/action-gh-release@v2.2.1 with: tag_name: "${{ inputs.use_tag }}" prerelease: false