From c170f75efaadf3feaf3a10a54da85093fdbd27b2 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Tue, 19 Mar 2024 12:37:59 -0400 Subject: [PATCH] Fix installation of shared library symlink This fixes the regression from 29391ccd9d513132fc802a198f8b801fb273cb59. The dummy target that was removed in 29391ccd9d513132fc802a198f8b801fb273cb59 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 eb3d97785cb4f6f6f4c0ffd6570ca6c73ccac2ec causing the libsleefgnuabi library to be missing the symlink... --- src/dft/CMakeLists.txt | 2 +- src/libm/CMakeLists.txt | 6 +++--- src/quad/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dft/CMakeLists.txt b/src/dft/CMakeLists.txt index acc65b82..abbeceac 100644 --- a/src/dft/CMakeLists.txt +++ b/src/dft/CMakeLists.txt @@ -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 diff --git a/src/libm/CMakeLists.txt b/src/libm/CMakeLists.txt index 9d347238..5cab91a7 100644 --- a/src/libm/CMakeLists.txt +++ b/src/libm/CMakeLists.txt @@ -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 @@ -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 @@ -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 diff --git a/src/quad/CMakeLists.txt b/src/quad/CMakeLists.txt index 7afcd029..4d9700d5 100644 --- a/src/quad/CMakeLists.txt +++ b/src/quad/CMakeLists.txt @@ -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