diff options
| author | Dirk Mueller <mueller@kde.org> | 2006-02-15 16:35:43 +0000 |
|---|---|---|
| committer | Dirk Mueller <mueller@kde.org> | 2006-02-15 16:35:43 +0000 |
| commit | dd6f99e06906fa58d4767c20d94747ac8ecc2032 (patch) | |
| tree | 940aed0ef2d02e866d7f912e18a807c214c2bc27 /modules | |
| parent | 195fe53dcd4a7121f6932ec7262495a3ca07f59c (diff) | |
| download | extra-cmake-modules-dd6f99e06906fa58d4767c20d94747ac8ecc2032.tar.gz extra-cmake-modules-dd6f99e06906fa58d4767c20d94747ac8ecc2032.tar.bz2 | |
set LD_LIBRARY_PATH to make sure we use the just compiled libraries, not
the installed ones.
svn path=/trunk/KDE/kdelibs/; revision=509806
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindKDE4.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 632bdd21..9cc6b397 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -95,14 +95,15 @@ 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}) endif (WIN32) set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}) set(KDE4_KALYPTUS_DIR ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/ ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - 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_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 ) # when building kdelibs, make the dcop and kcfg rules depend on the binaries... set( _KDE4_DCOPIDL2CPP_DEP dcopidl2cpp) |