[icinga-checkins] icinga.org: icinga2/master: Fix RPATH for the unit test binaries

git at icinga.org git at icinga.org
Sun Aug 28 17:22:43 CEST 2016


Module: icinga2
Branch: master
Commit: ad0e4f44893b36f04e5a66802d597d1e538068df
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=ad0e4f44893b36f04e5a66802d597d1e538068df

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sun Aug 28 17:19:20 2016 +0200

Fix RPATH for the unit test binaries

fixes #8806

---

 CMakeLists.txt |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9240064..504b0eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,12 +143,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/lib
 )
 
-#set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-
-if(APPLE)
-  set(CMAKE_INSTALL_NAME_DIR "@executable_path/..")
-  set(CMAKE_MACOSX_RPATH 0)
-endif(APPLE)
+set(CMAKE_MACOSX_RPATH 1)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -g")



More information about the icinga-checkins mailing list