Skip to content

Commit

Permalink
Fix installation of shared library symlink
Browse files Browse the repository at this point in the history
This partially reverts 29391cc.

The dummy target that was removed in 29391cc
was responsible for installing the unversioned symlink for the shared libraries.
The only part of this that was causing issue appears to be the dummy destination
that was only added as an workaround for old cmake version (pre 3.14-ish).
With the cmake version requirement bumped to 3.18 this should not be an issue anymore.

This also fixes a typo from eb3d977 causing
the libsleefgnuabi library to be missing the symlink...
  • Loading branch information
yuyichao committed Mar 19, 2024
1 parent e17e496 commit 7e5f683
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/dft/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -423,3 +423,10 @@ install(
INCLUDES #
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
)
install(
TARGETS ${TARGET_LIBDFT}
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
NAMELINK_ONLY
)
22 changes: 22 additions & 0 deletions src/libm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,14 @@ if(SLEEF_BUILD_SCALAR_LIB)
DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT sleef_Runtime
)

install(
TARGETS sleefscalar
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
NAMELINK_ONLY
)
endif()

# --------------------------------------------------------------------
Expand All @@ -1029,6 +1037,13 @@ install(
INCLUDES #
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
)
install(
TARGETS ${TARGET_LIBSLEEF}
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
NAMELINK_ONLY
)
configure_file("sleef.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sleef.pc" @ONLY)
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/sleef.pc"
Expand All @@ -1051,4 +1066,11 @@ if(ENABLE_GNUABI)
DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT sleef_Runtime
)
install(
TARGETS ${TARGET_LIBSLEEFGNUABI}
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
NAMELINK_ONLY
)
endif()
7 changes: 7 additions & 0 deletions src/quad/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -502,3 +502,10 @@ install(
INCLUDES #
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
)
install(
TARGETS sleefquad
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
NAMELINK_ONLY
)

0 comments on commit 7e5f683

Please sign in to comment.