[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/decibel
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2008-08-13 16:01:48
Message-ID: 1218643308.615461.19709.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 846512 by harald:

make sure decibel behaves like the rest of KDE when it comes to RPATH. This ensures \
that you will not get an interesting Qt mix with plugins. Done with Alexxx

 M  +6 -1      CMakeLists.txt  


--- trunk/kdesupport/decibel/CMakeLists.txt #846511:846512
@@ -24,9 +24,14 @@
 # Our own version that adds export macros:
 INCLUDE(Qt4DBusMacros)
 
+SET(CMAKE_SKIP_BUILD_RPATH            FALSE)
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 IF (APPLE)
     SET(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
-    SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
+#   This is not necessary - if something breaks on the mac, please send a mail to \
neundorf kde org +#   SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 ENDIF (APPLE)
 
 SET(MAJOR_VERSION "0")


[prev in list] [next in list] [prev in thread] [next in thread]