24 lines
888 B
Diff
24 lines
888 B
Diff
diff -r 4b4f7dca5ce2 SetPaths.cmake
|
|
--- a/SetPaths.cmake Sun May 30 14:28:22 2010 +0200
|
|
+++ b/SetPaths.cmake Sun May 30 14:29:28 2010 +0200
|
|
@@ -237,19 +237,3 @@
|
|
set(CMAKE_BUILD_TYPE RelWithDebInfo)
|
|
endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
|
|
|
|
-
|
|
-
|
|
-# setup default RPATH/install_name handling, may be overridden by KDE4_HANDLE_RPATH_FOR_[LIBRARY|EXECUTABLE]
|
|
-# default is to build with RPATH for the install dir, so it doesn't need to relink
|
|
-if (UNIX)
|
|
- if (APPLE)
|
|
- set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
|
|
- else (APPLE)
|
|
- # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
|
|
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
|
- set(CMAKE_SKIP_BUILD_RPATH TRUE)
|
|
- set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
|
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
|
- endif (APPLE)
|
|
-endif (UNIX)
|
|
-
|