[cmake-commits] hoffman committed FindKDE4.cmake 1.3.2.2 1.3.2.3 FindQt3.cmake 1.10.2.3 1.10.2.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14425/Modules

Modified Files:
      Tag: CMake-2-4
	FindKDE4.cmake FindQt3.cmake 
Log Message:
ENH: merge in changes from the main tree


Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- FindKDE4.cmake	24 Jul 2006 15:19:34 -0000	1.3.2.2
+++ FindKDE4.cmake	28 Nov 2006 19:19:44 -0000	1.3.2.3
@@ -12,8 +12,8 @@
 
 FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
 
-# First try to find kde-config, for KDE4 soon to be renamed to kde4-config
-FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config
+# For KDE4 kde-config has been renamed to kde4-config
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
    PATHS
    ${CMAKE_INSTALL_PREFIX}/bin
    ${_KDEDIRS}
@@ -23,11 +23,11 @@
 
 
 IF (NOT KDE4_KDECONFIG_EXECUTABLE)
-   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config )
+   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
 ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
 
 IF (KDE4_KDECONFIG_EXECUTABLE)
-   # then ask kde-config for the kde data dirs
+   # then ask kde4-config for the kde data dirs
    EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
 
    FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
@@ -58,7 +58,7 @@
 
 ELSE (KDE4_KDECONFIG_EXECUTABLE)
    IF (KDE4_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde-config")
+      MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde4-config")
    ENDIF (KDE4_FIND_REQUIRED)
 ENDIF (KDE4_KDECONFIG_EXECUTABLE)
 

Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- FindQt3.cmake	13 Oct 2006 14:52:01 -0000	1.10.2.3
+++ FindQt3.cmake	28 Nov 2006 19:19:44 -0000	1.10.2.4
@@ -280,17 +280,33 @@
   ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
 ENDIF(QT_FOUND)
 
+EXEC_PROGRAM(${QT_MOC_EXECUTABLE} ARGS "-v" OUTPUT_VARIABLE QTVERSION_MOC)
+EXEC_PROGRAM(${QT_UIC_EXECUTABLE} ARGS "-version" OUTPUT_VARIABLE QTVERSION_UI)
+
+SET(_QT_UIC_VERSION_3 FALSE)
+IF("${QTVERSION_UIC}" MATCHES ".* 3..*")
+  SET(_QT_UIC_VERSION_3 TRUE)
+ENDIF("${QTVERSION_UIC}" MATCHES ".* 3..*")
+
+SET(_QT_MOC_VERSION_3 FALSE)
+IF("${QTVERSION_MOC}" MATCHES ".* 3..*")
+  SET(_QT_MOC_VERSION_3 TRUE)
+ENDIF("${QTVERSION_MOC}" MATCHES ".* 3..*")
 
+SET(QT_WRAP_CPP FALSE)
 IF (QT_MOC_EXECUTABLE)   
-  SET ( QT_WRAP_CPP "YES")   
+  IF(_QT_MOC_VERSION_3)
+    SET ( QT_WRAP_CPP TRUE)
+  ENDIF(_QT_MOC_VERSION_3)
 ENDIF (QT_MOC_EXECUTABLE)   
 
+SET(QT_WRAP_UI FALSE)
 IF (QT_UIC_EXECUTABLE)   
-  SET ( QT_WRAP_UI "YES")   
+  IF(_QT_UIC_VERSION_3)
+    SET ( QT_WRAP_UI TRUE)
+  ENDIF(_QT_UIC_VERSION_3)
 ENDIF (QT_UIC_EXECUTABLE)   
 
-
-
 MARK_AS_ADVANCED(
   QT_INCLUDE_DIR
   QT_QT_LIBRARY