-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

3 files changed, 13 insertions, 4 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
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 6653995a..894c42b1 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -494,7 +494,7 @@ IF(QT4_QMAKE_FOUND)
   _QT4_ADJUST_LIB_VARS(QTCORE)
   _QT4_ADJUST_LIB_VARS(QTGUI)
   _QT4_ADJUST_LIB_VARS(QT3SUPPORT)
-  _QT4_ADJUST_LIB_VARS(QTASSISTENT)
+  _QT4_ADJUST_LIB_VARS(QTASSISTANT)
   _QT4_ADJUST_LIB_VARS(QTDESIGNER)
   _QT4_ADJUST_LIB_VARS(QTMOTIF)
   _QT4_ADJUST_LIB_VARS(QTNETWORK)
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 34a528d2..4034ebb6 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -61,7 +61,7 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources)
         ADD_CUSTOM_COMMAND(OUTPUT ${_skel}
            COMMAND ${KDE4_DCOPIDL2CPP_EXECUTABLE}
            ARGS --c++-suffix cpp --no-signals --no-stub ${_kidl}
-           DEPENDS ${_kidl} dcopidl2cpp )
+           DEPENDS ${_kidl} ${_KDE4_DCOPIDL2CPP_DEP} )
            
         MACRO_ADDITIONAL_CLEAN_FILES( ${_skel_H})
 
@@ -101,7 +101,7 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources)
         ADD_CUSTOM_COMMAND(OUTPUT ${_stub_CPP}
            COMMAND ${KDE4_DCOPIDL2CPP_EXECUTABLE}
            ARGS --c++-suffix cpp --no-signals --no-skel ${_kidl}
-           DEPENDS ${_kidl} dcopidl2cpp )
+           DEPENDS ${_kidl} ${_KDE4_DCOPIDL2CPP_DEP} )
            
         MACRO_ADDITIONAL_CLEAN_FILES( ${_stub_H})
         
@@ -130,7 +130,7 @@ MACRO(KDE4_ADD_KCFG_FILES _sources)
       ADD_CUSTOM_COMMAND(OUTPUT ${_src_FILE}
          COMMAND ${KDE4_KCFGC_EXECUTABLE}
          ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ${_tmp_FILE}
-         DEPENDS ${_tmp_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} kconfig_compiler )
+         DEPENDS ${_tmp_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ${_KDE4_KCONFIG_COMPILER_DEP} )
 
       SET(${_sources} ${${_sources}} ${_src_FILE})