-implemented RPATH handling, but disabled for now

to enable it again, remove the line 104, where KDE4_NEED_WRAPPER_SCRIPTS is set to false again

If you have current cmake cvs, you can then:
-enable CMAKE_SKIP_RPATH using ccmake, then everything will be built without RPATH
-disable CMAKE_SKIP_RPATH and enable KDE4_RPATH_TO_BUILD_DIR, then everything will be built with RPATH pointing to both the build and the install dir
-disable CMAKE_SKIP_RPATH and disable KDE4_RPATH_TO_BUILD_DIR, then everything will be built with RPATH pointing to the install dir

In all three cases no relinking will happen during install.

If built without RPATH to the builddir, the executables are executed using wrapper scripts named <name>.sh, e.g. kconfig_compiler.sh.

some changes to the kde3 stuff:
-renamed KDE3_ADD_KLM to KDE3_ADD_KDEINIT_EXECUTABLE
-removed KDE3_PLACEHOLDER
-removed KDE3_CREATE_LIBTOOL_FILE to KDE3_INSTALL_LIBTOOL_FILE

Please check whether it still works for you and let me know. I plan to move the KDE3 related files to cmake RSN.

CCMAIL: kde-buildsystem@kde.org
CCMAIL: b_mann@gmx.de
CCMAIL: christian.loose@hamburg.de

Alex

svn path=/trunk/KDE/kdelibs/; revision=516642

3 files changed, 14 insertions, 32 deletions

diff --git a/samples/kcalc/CMakeLists.txt b/samples/kcalc/CMakeLists.txt
index 1a3c4ec5..8418baf6 100644
--- a/samples/kcalc/CMakeLists.txt
+++ b/samples/kcalc/CMakeLists.txt
@@ -30,33 +30,25 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 ########### next target ###############
 
 SET(kcalc_KDEINIT_SRCS
-kcalc.cpp
-kcalc_button.cpp
-kcalc_const_button.cpp
-kcalc_const_menu.cpp
-kcalc_core.cpp
-kcalcdisplay.cpp
-dlabel.cpp
-stats.cpp
-)
+   kcalc.cpp
+   kcalc_button.cpp
+   kcalc_const_button.cpp
+   kcalc_const_menu.cpp
+   kcalc_core.cpp
+   kcalcdisplay.cpp
+   dlabel.cpp
+   stats.cpp
+   )
 
 KDE3_AUTOMOC(${kcalc_KDEINIT_SRCS})
 
-SET( kcalc_UI
-colors.ui
-general.ui
-constants.ui
-)
+SET( kcalc_UI colors.ui general.ui constants.ui )
 
 KDE3_ADD_UI_FILES(kcalc_KDEINIT_SRCS ${kcalc_UI} )
 
-SET( kcalc_KCFG_SRCS
-kcalc_settings.kcfgc
-)
+KDE3_ADD_KCFG_FILES(kcalc_KDEINIT_SRCS kcalc_settings.kcfgc )
 
-KDE3_ADD_KCFG_FILES(kcalc_KDEINIT_SRCS ${kcalc_KCFG_SRCS})
-
-KDE3_ADD_KLM( kcalc ${kcalc_KDEINIT_SRCS})
+KDE3_ADD_KDEINIT_EXECUTABLE( kcalc ${kcalc_KDEINIT_SRCS})
 
 # gmp, knumber and kdeui added manually
 TARGET_LINK_LIBRARIES(kdeinit_kcalc  ${QT_AND_KDECORE_LIBS} kdeui knumber gmp)
@@ -75,7 +67,6 @@ INSTALL_FILES( /share/apps/kconf_update FILES kcalcrc.upd )
 
 KDE3_INSTALL_ICONS( hicolor )
 
-KDE3_PLACEHOLDER()
 
 
 
diff --git a/samples/kcalc/knumber/CMakeLists.txt b/samples/kcalc/knumber/CMakeLists.txt
index 77042474..5be3ca14 100644
--- a/samples/kcalc/knumber/CMakeLists.txt
+++ b/samples/kcalc/knumber/CMakeLists.txt
@@ -8,10 +8,7 @@ ADD_DEFINITIONS(-D_GNU_SOURCE -D_ISOC99_SOURCE ) # added manually
 
 ########### next target ###############
 
-SET(knumber_STAT_SRCS
-knumber.cpp
-knumber_priv.cpp
-)
+SET(knumber_STAT_SRCS knumber.cpp knumber_priv.cpp )
 
 KDE3_AUTOMOC(${knumber_STAT_SRCS})
 
@@ -21,8 +18,6 @@ ADD_LIBRARY(knumber STATIC ${knumber_STAT_SRCS})
 ########### install files ###############
 
 
-KDE3_PLACEHOLDER()
-
 
 
 #original Makefile.am contents follow:
diff --git a/samples/kcalc/knumber/tests/CMakeLists.txt b/samples/kcalc/knumber/tests/CMakeLists.txt
index 243de913..72a55b6d 100644
--- a/samples/kcalc/knumber/tests/CMakeLists.txt
+++ b/samples/kcalc/knumber/tests/CMakeLists.txt
@@ -3,9 +3,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kcalc/knumber ${KDE3_INCLUDE_DIR} ${QT_
 
 ########### next target ###############
 
-SET(knumbertest_SRCS
-knumbertest.cpp
-)
+SET(knumbertest_SRCS knumbertest.cpp )
 
 KDE3_AUTOMOC(${knumbertest_SRCS})
 
@@ -19,8 +17,6 @@ ENDIF(KDE3_BUILD_TESTS)
 ########### install files ###############
 
 
-KDE3_PLACEHOLDER()
-
 
 
 #original Makefile.am contents follow: