From 63576c08fe0beedf7d0c5485c858e5a0933476fe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
Date: Thu, 19 Sep 2013 12:29:50 +0200
Subject: [PATCH] CMake: Fix installing shared plugins

Do not use absolute path in install command, but relative from new variable
CMAKE_INSTALL_PLUGIN_DIR. Absolute paths in cmake can break packaging.

REVIEW: 112831
---
 CMakeLists.txt            | 16 +++++++++++-----
 cmake/TrojitaOption.cmake |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ce80eb..e48c1341 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,8 +95,18 @@ if(WIN32)
     endif()
 endif()
 
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR "lib${LIB_SUFFIX}")
+endif()
+mark_as_advanced(CMAKE_INSTALL_LIBDIR)
+
+if(NOT CMAKE_INSTALL_PLUGIN_DIR)
+    set(CMAKE_INSTALL_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/trojita")
+endif()
+mark_as_advanced(CMAKE_INSTALL_PLUGIN_DIR)
+
 if(NOT PLUGIN_DIR)
-    set(PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/trojita")
+    set(PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_PLUGIN_DIR}")
 endif()
 mark_as_advanced(PLUGIN_DIR)
 
@@ -192,10 +202,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/configure.cmake.in
 
 feature_summary(FATAL_ON_MISSING_REQUIRED_PACKAGES DESCRIPTION "\n" WHAT ALL)
 
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib${LIB_SUFFIX}")
-endif()
-
 set(path_Common ${CMAKE_CURRENT_SOURCE_DIR}/src/Common)
 set(libCommon_SOURCES
     ${path_Common}/Application.cpp
diff --git a/cmake/TrojitaOption.cmake b/cmake/TrojitaOption.cmake
index 390cf9ae..0931c0c9 100644
--- a/cmake/TrojitaOption.cmake
+++ b/cmake/TrojitaOption.cmake
@@ -93,7 +93,7 @@ macro(trojita_add_plugin target type)
     else()
         message(STATUS "Building shared plugin ${target}")
         add_library(${target} MODULE ${ARGN})
-        install(TARGETS ${target} DESTINATION ${PLUGIN_DIR})
+        install(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_PLUGIN_DIR})
     endif()
     set_target_properties(${target} PROPERTIES PREFIX "")
     set_property(TARGET ${target} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_PLUGIN)
-- 
2.11.4.GIT