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

List:       kde-commits
Subject:    kdesupport/decibel
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-12-02 16:12:16
Message-ID: 1228234336.792445.10674.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 891686 by neundorf:

-set up RPATH handling the same way as for the other kdesupport projects (poiting to \
                Qt4 and LIB_INSTALL_DIR)
-consistent casing in the toplevel CmakeLists.txt

Alex




 M  +20 -15    CMakeLists.txt  


--- trunk/kdesupport/decibel/CMakeLists.txt #891685:891686
@@ -1,8 +1,8 @@
 PROJECT(Decibel)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-cmake_policy(SET CMP0003 NEW)
+CMAKE_POLICY(SET CMP0003 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" \
${CMAKE_MODULE_PATH}) +SET(CMAKE_MODULE_PATH \
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})  \
SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)  
 # Warning: We want the decibel daemon to be useable without KDE4
@@ -17,23 +17,13 @@
 FIND_PACKAGE(TelepathyQt REQUIRED)
 FIND_PACKAGE(TapiocaQt REQUIRED)
 
-if (NOT QT_QTDBUS_FOUND)
-   message(FATAL_ERROR  "Decibel requires Qt4 with QtDBus module in order to \
                built.")
-endif(NOT QT_QTDBUS_FOUND)
+IF (NOT QT_QTDBUS_FOUND)
+   MESSAGE(FATAL_ERROR  "Decibel requires Qt4 with QtDBus module in order to \
built.") +ENDIF(NOT QT_QTDBUS_FOUND)
 
 # 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})
-
-#   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")
 SET(MINOR_VERSION "7")
 SET(PATCH_LEVEL "1")
@@ -99,6 +89,21 @@
 #     "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
 # )
 
+# Set up RPATH handling, so the libs are found if they are installed to a \
non-standard location. +# By default cmake builds the targets with full RPATH to \
everything in the build directory, +# but then removes the RPATH when installing.
+# These two options below make it set the RPATH of the installed targets to all
+# RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
+# install directory. Alex
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
+
+IF(APPLE)
+   SET(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+ENDIF(APPLE)
+
+
+
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(docs)


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