]> granicus.if.org Git - zziplib/commitdiff
build: Fix libdir paths
authorJan Tojnar <jtojnar@gmail.com>
Mon, 13 Apr 2020 13:33:39 +0000 (15:33 +0200)
committerJan Tojnar <jtojnar@gmail.com>
Mon, 13 Apr 2020 13:33:39 +0000 (15:33 +0200)
CMAKE_INSTALL_LIBDIR can be absolute so appending to it CMAKE_INSTALL_PREFIX might not work.

zzip/CMakeLists.txt
zzipwrap/CMakeLists.txt

index 8ba8dab5846a165f01d29db72be71824dd5683da..c7f92e01c2e232e7e92513584f877bd753ceb92e 100644 (file)
@@ -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)
index 8bb391b8139eec807e06b424c8e9991cd0f9f643..5ac2682e3a1ccd418cc3b4564357e66b40addd16 100644 (file)
@@ -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)