From ff3a2fe3dabc68e4b0711e6848aa50af7465576e Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Tue, 12 Mar 2019 15:53:52 +0100 Subject: [PATCH] CMake: Handle INSTALL_RPATH globally and allow external additions --- CMakeLists.txt | 1 + icinga-app/CMakeLists.txt | 1 - plugins/CMakeLists.txt | 3 --- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b53844fd..888b462a3 100644 --- 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 d3ecfe8ab..ee3443b28 100644 --- 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 ebf0c77df..27fddecff 100644 --- 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 ) -- 2.40.0