diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-09 17:30:10 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-09 17:30:10 +0000 |
| commit | 16c16f6238c4cd2c5c649af5cd64a7f5b87f64e7 (patch) | |
| tree | 3914ce6304fc7f78ee3ea7b7d96ec03155f4cdc3 /modules/FindKDE4.cmake | |
| parent | 8da037b9c177dc8055725beac87841f10d4ae80f (diff) | |
| download | extra-cmake-modules-16c16f6238c4cd2c5c649af5cd64a7f5b87f64e7.tar.gz extra-cmake-modules-16c16f6238c4cd2c5c649af5cd64a7f5b87f64e7.tar.bz2 | |
-move find_package(pcre) back to kdelibs/CMakeLists.txt, otherwise HAVE_PCREPOSIX doesn't get set
-use qPrintable() in kded/kbuildsycoca.cpp
patches by Brad King:
-fix stat.h for mingw
-fix typo in FindQt4.cmake
-only depend on dcopidl2ccp and kconfig_compiler when compiling kdelibs
Alex
svn path=/trunk/KDE/kdelibs/; revision=507620
Diffstat (limited to 'modules/FindKDE4.cmake')
| -rw-r--r-- | modules/FindKDE4.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index e8dda0a9..e4f0a2d6 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -98,8 +98,17 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) SET(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp ) SET(KDE4_KCFGC_EXECUTABLE ${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) + SET( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) + + ELSE(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) + # ... but not otherwise + SET( _KDE4_DCOPIDL2CPP_DEP ) + SET( _KDE4_KCONFIG_COMPILER_DEP) + # at first the KDE include direcory # this should better check for a header which didn't exist in KDE < 4 FIND_PATH(KDE4_INCLUDE_DIR kurl.h |