ENH: merge from main tree

3 files changed, 33 insertions, 30 deletions

diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index c403fb6..b5abc0b 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -18,12 +18,23 @@ FIND_LIBRARY(JPEG_LIBRARY
   PATHS /usr/lib /usr/local/lib
   )
 
-IF (JPEG_LIBRARY)
-  IF (JPEG_INCLUDE_DIR)
+IF (JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
     SET(JPEG_LIBRARIES ${JPEG_LIBRARY})
     SET(JPEG_FOUND "YES")
-  ENDIF (JPEG_INCLUDE_DIR)
-ENDIF (JPEG_LIBRARY)
+ELSE (JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
+  SET(JPEG_FOUND "NO")
+ENDIF (JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
+
+
+IF (JPEG_FOUND)
+   IF (NOT JPEG_FIND_QUIETLY)
+      MESSAGE(STATUS "Found JPEG: ${JPEG_LIBRARIES}")
+   ENDIF (NOT JPEG_FIND_QUIETLY)
+ELSE (JPEG_FOUND)
+   IF (JPEG_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find JPEG library")
+   ENDIF (JPEG_FIND_REQUIRED)
+ENDIF (JPEG_FOUND)
 
 # Deprecated declarations.
 SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake
index 17affad..211947e 100644
--- a/Modules/FindKDE4.cmake
+++ b/Modules/FindKDE4.cmake
@@ -10,18 +10,15 @@
 #
 # Author: Alexander Neundorf <neundorf@kde.org>
 
+FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
+
 # First try to find kde-config
 FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config
    PATHS
    ${CMAKE_INSTALL_PREFIX}/bin
-   $ENV{KDEDIR}/bin
+   ${_KDEDIRS}
    /opt/kde4/bin
-   /opt/kde
-   /bin
-   /usr/bin
-   /usr/local/bin
-   NO_SYSTEM_PATH
-   NO_CMAKE_SYSTEM_PATH
+   NO_DEFAULT_PATH
    )
 
 
@@ -33,14 +30,7 @@ IF (KDE4_KDECONFIG_EXECUTABLE)
    # then ask kde-config for the kde data dirs
    EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
 
-
-   IF(WIN32)
-      # cmake can't handle paths with '\' correct :-(
-      STRING(REGEX REPLACE "\\\\" "/" _data_DIR "${_data_DIR}")
-   ELSE(WIN32)
-      # replace the ":" with ";" so that it becomes a valid cmake list
-      STRING(REGEX REPLACE ":" ";" _data_DIR "${_data_DIR}")
-   ENDIF(WIN32)
+   FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
 
    # then check the data dirs for FindKDE4Internal.cmake
    FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
@@ -48,7 +38,7 @@ IF (KDE4_KDECONFIG_EXECUTABLE)
    # if it has been found...
    IF (KDE4_DATA_DIR)
 
-      SET(CMAKE_MODULE_PATH  ${KDE4_DATA_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+      SET(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
 
       IF (KDE4_FIND_QUIETLY)
          SET(_quiet QUIET)
@@ -61,13 +51,14 @@ IF (KDE4_KDECONFIG_EXECUTABLE)
       # use FindKDE4Internal.cmake to do the rest
       FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
    ELSE (KDE4_DATA_DIR)
+      IF (KDE4_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
+      ENDIF (KDE4_FIND_REQUIRED)
    ENDIF (KDE4_DATA_DIR)
 
+ELSE (KDE4_KDECONFIG_EXECUTABLE)
+   IF (KDE4_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde-config")
+   ENDIF (KDE4_FIND_REQUIRED)
 ENDIF (KDE4_KDECONFIG_EXECUTABLE)
 
-
-IF (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND)
-   MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4")
-ENDIF (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND)
-
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e5db44b..8f20d48 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -176,7 +176,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
   $ENV{QTDIR}/bin
-)
+  )
 
 SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
 
@@ -642,24 +642,25 @@ IF (QT4_QMAKE_FOUND)
 
    # find moc and uic using qmake
    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmpQmake/tmp.pro
-      "message("MOC <$$QMAKE_MOC>")
-      message("UIC <$$QMAKE_UIC>")
+    "message(MOC<$$QMAKE_MOC>)
+      message(UIC<$$QMAKE_UIC>)
    ")
 
    EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
       WORKING_DIRECTORY  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmpQmake
       OUTPUT_VARIABLE _moc_OUTPUT
       ERROR_VARIABLE _moc_OUTPUT )
-
    FILE(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmpQmake")
 
    STRING(REGEX REPLACE ".*MOC<([^>]+).*" "\\1" QT_MOC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
    STRING(REGEX REPLACE ".*UIC<([^>]+).*" "\\1" QT_UIC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
 
+  FILE(TO_CMAKE_PATH ${QT_MOC_EXECUTABLE_INTERNAL} QT_MOC_EXECUTABLE_INTERNAL)
+  FILE(TO_CMAKE_PATH ${QT_UIC_EXECUTABLE_INTERNAL} QT_UIC_EXECUTABLE_INTERNAL)
+
    SET(QT_MOC_EXECUTABLE ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
    SET(QT_UIC_EXECUTABLE ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
 
-
   FIND_PROGRAM(QT_UIC3_EXECUTABLE
     NAMES uic3
     PATHS ${QT_BINARY_DIR}