CMake: Handle INSTALL_RPATH globally and allow external additions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b53844fd53f75530ee9f0c938101ce3ba2431bb..888b462a393bfacbe6b3026d0f975a8f729576a1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,7 @@ if(WIN32)
 endif()
 
 set(CMAKE_MACOSX_RPATH 1)
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${CMAKE_INSTALL_FULL_LIBDIR}/icinga2")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")

diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index d3ecfe8ab95a5caab7ad6d9daa9239feea1ab44e..ee3443b288f930ab5fda104bddf08021a5598520 100644 (file)
--- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt
@@ -68,7 +68,6 @@ target_link_libraries(icinga-app ${base_DEPS})
 
 set_target_properties (
   icinga-app PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
   FOLDER Bin
   OUTPUT_NAME icinga2
 )

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ebf0c77df4e712b10ecd1330930ec1b8bb45f9ab..27fddecff69925fb8a98ddd0e6254382bbcc323b 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -9,7 +9,6 @@ add_executable(check_nscp_api
 target_link_libraries(check_nscp_api ${base_DEPS})
 set_target_properties (
   check_nscp_api PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
   DEFINE_SYMBOL I2_PLUGINS_BUILD
   FOLDER Plugins)
 
@@ -32,7 +31,6 @@ if (WIN32)
 
   set_target_properties(
     thresholds PROPERTIES
-    INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
     FOLDER Plugins
   )
 
@@ -50,7 +48,6 @@ if (WIN32)
 
     set_target_properties(
       ${check_OUT} PROPERTIES
-      INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
       DEFINE_SYMBOL I2_PLUGINS_BUILD
       FOLDER Plugins
     )