From 353fc38e5de3462e7402f3f30b833499cca3e4d5 Mon Sep 17 00:00:00 2001
From: Yann Dirson <ydirson@free.fr>
Date: Mon, 22 Aug 2011 23:49:05 +0200
Subject: [PATCH] Comment out INSTALL_RPATH flag on executables.

---
 CMakeLists.txt                            | 6 ------
 software/tulip/CMakeLists.txt             | 6 ------
 software/tulip_perspective/CMakeLists.txt | 8 --------
 software/tulip_updater/CMakeLists.txt     | 8 --------
 4 files changed, 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 019dc9a..20ce41d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,6 @@ FUNCTION(ADD_LIBRARY name)
   IF(APPLE)
     SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
   ENDIF(APPLE)
-  SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
   IF(MSVC)
     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}")
     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}")
@@ -121,11 +120,6 @@ FUNCTION(ADD_EXECUTABLE name)
   IF(APPLE)
     SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
   ENDIF(APPLE)
-  IF(LINUX OR APPLE)
-    SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-  ELSE(LINUX OR APPLE)
-    SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
-  ENDIF(LINUX OR APPLE)
   IF(MSVC)
     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}")
     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/software/tulip/CMakeLists.txt b/software/tulip/CMakeLists.txt
index aeeabb6..44353ca 100644
--- a/software/tulip/CMakeLists.txt
+++ b/software/tulip/CMakeLists.txt
@@ -54,12 +54,6 @@ ENDIF(USE_QT5)
 
 ADD_EXECUTABLE(tulip ${SRCS} ${UI_HEADERS} ${MOC_SRCS} ${RCC_SRCS})
 
-IF(LINUX OR APPLE)
-  SET_TARGET_PROPERTIES(tulip PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-ELSE()
-  SET_TARGET_PROPERTIES(tulip PROPERTIES INSTALL_RPATH "$ORIGIN")
-ENDIF()
-
 TARGET_LINK_LIBRARIES(tulip crash_handling ${LibTulipCoreName} ${LibTulipOGLName} ${LibTulipGUIName} ${QT_LIBRARIES} ${QxtLibrary})
 
 INSTALL(TARGETS tulip
diff --git a/software/tulip_perspective/CMakeLists.txt b/software/tulip_perspective/CMakeLists.txt
index ff3afe4..dea9b65 100644
--- a/software/tulip_perspective/CMakeLists.txt
+++ b/software/tulip_perspective/CMakeLists.txt
@@ -17,14 +17,6 @@ ENDIF(USE_QT5)
 
 ADD_EXECUTABLE(tulip_perspective ${SRCS} ${MOC_SRCS})
 
-IF(LINUX)
-  SET_TARGET_PROPERTIES(tulip_perspective PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-ELSEIF(APPLE)
-  SET_TARGET_PROPERTIES(tulip_perspective PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-ELSE()
-  SET_TARGET_PROPERTIES(tulip_perspective PROPERTIES INSTALL_RPATH "$ORIGIN")
-ENDIF()
-
 TARGET_LINK_LIBRARIES(tulip_perspective crash_handling)
 
 TARGET_LINK_LIBRARIES(tulip_perspective ${LibTulipCoreName} ${LibTulipOGLName} ${LibTulipGUIName} ${QT_LIBRARIES})
diff --git a/software/tulip_updater/CMakeLists.txt b/software/tulip_updater/CMakeLists.txt
index 05f17a3..a72df34 100644
--- a/software/tulip_updater/CMakeLists.txt
+++ b/software/tulip_updater/CMakeLists.txt
@@ -10,14 +10,6 @@ ENDIF(USE_QT5)
 
 ADD_EXECUTABLE(tulip_update ${SRCS})
 
-IF(LINUX)
-  SET_TARGET_PROPERTIES(tulip_perspective PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-ELSEIF(APPLE)
-  SET_TARGET_PROPERTIES(tulip_perspective PROPERTIES INSTALL_RPATH "$ORIGIN/../Frameworks")
-ELSE()
-  SET_TARGET_PROPERTIES(tulip_perspective PROPERTIES INSTALL_RPATH "$ORIGIN")
-ENDIF()
-
 TARGET_LINK_LIBRARIES(tulip_updater ${QT_LIBRARIES})
 
 TARGET_LINK_LIBRARIES(tulip_perspective crash_handling)
-- 
2.1.1