diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-03-22 17:42:03 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-03-22 17:42:03 +0000 |
| commit | 7787b27ca96ad46b2b3cef47e93b3bd04e19c160 (patch) | |
| tree | 3ee132e3c56baf65485d099cc4c1a4d8f5d0e6f4 | |
| parent | e68dbc077d76f0f79750fc0627c8e0e4794998b2 (diff) | |
| download | extra-cmake-modules-7787b27ca96ad46b2b3cef47e93b3bd04e19c160.tar.gz extra-cmake-modules-7787b27ca96ad46b2b3cef47e93b3bd04e19c160.tar.bz2 | |
again revert the KDE4_LD_LIBRARY_PATH change
Dirk, why is this required for you ?
It really shouldn't.
Either you compile with RPATH, then everything should be found via RPATH
and no LD_LIBRARY_PATH is required.
Or you set RPATH_STYLE e.g. to "none", then the generated wrapper scripts (like dcopidl2cpp.sh)
should set LD_LIBRARY_PATH correctly. I tested this here on Slackware and on FreeBSD.
What doesn't work for you ?
Let's discuss this on kde-buildsystem@kde.org
CCMAIL:mueller@kde.org
Alex
svn path=/trunk/KDE/kdelibs/; revision=521485
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 8bac034e..887ed493 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -267,7 +267,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) else (WIN32) set(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - set(KDE4_LD_LIBRARY_PATH LD_LIBRARY_PATH=${LIBRARY_OUTPUT_PATH}\$\${LD_LIBRARY_PATH+:\$\$LD_LIBRARY_PATH} ) +# set(KDE4_LD_LIBRARY_PATH LD_LIBRARY_PATH=${LIBRARY_OUTPUT_PATH}\$\${LD_LIBRARY_PATH+:\$\$LD_LIBRARY_PATH} ) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) @@ -275,13 +275,13 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC if (KDE4_NEED_WRAPPER_SCRIPTS) - set(KDE4_DCOPIDL2CPP_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp.sh ) - set(KDE4_KCFGC_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.sh ) - set(KDE4_MEINPROC_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc.sh ) + set(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp.sh ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.sh ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc.sh ) else (KDE4_NEED_WRAPPER_SCRIPTS) - set(KDE4_DCOPIDL2CPP_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp ) - set(KDE4_KCFGC_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) - set(KDE4_MEINPROC_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc ) + set(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc ) endif (KDE4_NEED_WRAPPER_SCRIPTS) # when building kdelibs, make the dcop and kcfg rules depend on the binaries... @@ -688,4 +688,4 @@ set(KDE4_INCLUDE_DIRS ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${_KDE4_PLATFORM_INCLUD set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DQT3_SUPPORT_WARNINGS -DKDE_DEPREACTED_WARNINGS ) # always add CMAKE_CCURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR to the include path to save some typing, Alex -set(CMAKE_INCLUDE_CURRENT_DIR TRUE) +set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
\ No newline at end of file |