From e82dc78a1ca427c4ad45a76565bb6604376c3bc8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 13 Apr 2020 15:33:39 +0200 Subject: [PATCH] build: Fix libdir paths CMAKE_INSTALL_LIBDIR can be absolute so appending to it CMAKE_INSTALL_PREFIX might not work. --- zzip/CMakeLists.txt | 4 ++-- zzipwrap/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt index 8ba8dab..c7f92e0 100644 --- a/zzip/CMakeLists.txt +++ b/zzip/CMakeLists.txt @@ -263,7 +263,7 @@ if(ZZIPCOMPAT) if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) get_target_property(libname libzzip OUTPUT_NAME) get_target_property(librelease libzzip RELEASE_POSTFIX) get_target_property(libversion libzzip VERSION) @@ -284,7 +284,7 @@ if(ZZIPLIBTOOL) if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) get_target_property(libname libzzip OUTPUT_NAME) get_target_property(librelease libzzip RELEASE_POSTFIX) get_target_property(libversion libzzip VERSION) diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt index 8bb391b..5ac2682 100644 --- a/zzipwrap/CMakeLists.txt +++ b/zzipwrap/CMakeLists.txt @@ -78,7 +78,7 @@ if(ZZIPLIBTOOL) if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) get_target_property(libname libzzipwrap OUTPUT_NAME) get_target_property(librelease libzzipwrap RELEASE_POSTFIX) get_target_property(libversion libzzipwrap VERSION) -- 2.40.0