From 04c19d5757c9ba12a871046dac340b5bd967f973 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Mon, 2 May 2016 21:36:16 +0200
Subject: Fix for cmake installing libs, using a subfolder for clarity when
 installing system-wide

(bzr r14867)
---
 CMakeLists.txt                  | 2 +-
 CMakeScripts/HelperMacros.cmake | 5 ++++-
 src/CMakeLists.txt              | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1494afef7..3592d2e0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ project(inkscape)
 set(INKSCAPE_VERSION 0.91+devel)
 set(PROJECT_NAME inkscape)
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/")
+SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape")
 
 
 cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths
diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake
index 4577b5e72..d5e6d8536 100644
--- a/CMakeScripts/HelperMacros.cmake
+++ b/CMakeScripts/HelperMacros.cmake
@@ -34,7 +34,10 @@ macro(add_inkscape_lib
     # works fine without having the includes
     # listed is helpful for IDE's (QtCreator/MSVC)
     inkscape_source_group("${sources}")
-    install(TARGETS ${name} LIBRARY DESTINATION lib)
+    install(TARGETS ${name} 
+        LIBRARY DESTINATION lib/inkscape
+        ARCHIVE DESTINATION lib/inkscape
+        )
 
 endmacro()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d57a59c1..df25728f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -571,7 +571,8 @@ target_link_libraries(inkview inkscape_base)
 install(
     TARGETS inkscape_base inkscape inkview 
   RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
+  LIBRARY DESTINATION lib/inkscape
+  ARCHIVE DESTINATION lib/inkscape
   )
 
   
-- 
cgit v1.2.3