Skip to content

Commit

Permalink
Fix installation of shared library symlink
Browse files Browse the repository at this point in the history
This fixes the regression from 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,
and we could also use the new NAMELINK_COMPONENT option to avoid using two install
statements.

This also fixes a bug from eb3d977 causing
the libsleefgnuabi library to be missing the symlink...
  • Loading branch information
yuyichao committed Mar 19, 2024
1 parent e17e496 commit c170f75
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/dft/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ install(
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Runtime
NAMELINK_SKIP
NAMELINK_COMPONENT sleef_Development
ARCHIVE #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
Expand Down
6 changes: 3 additions & 3 deletions src/libm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ if(SLEEF_BUILD_SCALAR_LIB)
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Runtime
NAMELINK_SKIP
NAMELINK_COMPONENT sleef_Development
ARCHIVE #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
Expand All @@ -1019,7 +1019,7 @@ install(
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Runtime
NAMELINK_SKIP
NAMELINK_COMPONENT sleef_Development
ARCHIVE #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
Expand All @@ -1043,7 +1043,7 @@ if(ENABLE_GNUABI)
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Runtime
NAMELINK_SKIP
NAMELINK_COMPONENT sleef_Development
ARCHIVE #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
Expand Down
2 changes: 1 addition & 1 deletion src/quad/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ install(
LIBRARY #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Runtime
NAMELINK_SKIP
NAMELINK_COMPONENT sleef_Development
ARCHIVE #
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT sleef_Development
Expand Down

0 comments on commit c170f75

Please sign in to comment.