[cmake-commits] hoffman committed CMakeCXXInformation.cmake 1.12 1.12.2.1 CMakeDetermineCCompiler.cmake 1.35.2.2 1.35.2.3 CMakeDetermineCXXCompiler.cmake 1.27.2.2 1.27.2.3 CMakeDetermineFortranCompiler.cmake 1.10.2.1 1.10.2.2 CMakeDetermineRCCompiler.cmake 1.5.2.1 1.5.2.2 CMakeFortranInformation.cmake 1.12 1.12.2.1 CMakeSystemSpecificInformation.cmake 1.35 1.35.2.1 CheckCSourceCompiles.cmake 1.6.2.3 1.6.2.4 CheckCXXSourceCompiles.cmake 1.8.2.3 1.8.2.4 FindDoxygen.cmake 1.7 1.7.2.1 FindGLUT.cmake 1.17 1.17.2.1 FindKDE3.cmake 1.3 1.3.2.1 FindPNG.cmake 1.13 1.13.2.1 FindPythonInterp.cmake 1.5 1.5.2.1 FindPythonLibs.cmake 1.26 1.26.2.1 FindQt3.cmake 1.10.2.2 1.10.2.3 FindQt4.cmake 1.25.2.6 1.25.2.7 FindRuby.cmake 1.5 1.5.2.1 FindSDL.cmake 1.9 1.9.2.1 FindTCL.cmake 1.39 1.39.2.1 FindwxWidgets.cmake 1.2.6.1 1.2.6.2 InstallRequiredSystemLibraries.cmake 1.3 1.3.2.1 KDE3Macros.cmake 1.2.2.1 1.2.2.2 UseEcos.cmake 1.1.2.1 1.1.2.2 UseQt4.cmake 1.3.2.1 1.3.2.2 UseSWIG.cmake 1.14 1.14.2.1 kde3uic.cmake 1.1.2.1 1.1.2.2 readme.txt 1.7.2.1 1.7.2.2

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Oct 13 10:52:05 EDT 2006


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

Modified Files:
      Tag: CMake-2-4
	CMakeCXXInformation.cmake CMakeDetermineCCompiler.cmake 
	CMakeDetermineCXXCompiler.cmake 
	CMakeDetermineFortranCompiler.cmake 
	CMakeDetermineRCCompiler.cmake CMakeFortranInformation.cmake 
	CMakeSystemSpecificInformation.cmake 
	CheckCSourceCompiles.cmake CheckCXXSourceCompiles.cmake 
	FindDoxygen.cmake FindGLUT.cmake FindKDE3.cmake FindPNG.cmake 
	FindPythonInterp.cmake FindPythonLibs.cmake FindQt3.cmake 
	FindQt4.cmake FindRuby.cmake FindSDL.cmake FindTCL.cmake 
	FindwxWidgets.cmake InstallRequiredSystemLibraries.cmake 
	KDE3Macros.cmake UseEcos.cmake UseQt4.cmake UseSWIG.cmake 
	kde3uic.cmake readme.txt 
Log Message:
ENH: merge changes from the main tree to the 2.4 branch


Index: FindPythonInterp.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonInterp.cmake,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- FindPythonInterp.cmake	15 Dec 2005 19:17:42 -0000	1.5
+++ FindPythonInterp.cmake	13 Oct 2006 14:52:01 -0000	1.5.2.1
@@ -7,8 +7,9 @@
 #
 
 FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+  NAMES python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
   PATHS
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]

Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- FindSDL.cmake	15 Dec 2005 19:17:42 -0000	1.9
+++ FindSDL.cmake	13 Oct 2006 14:52:01 -0000	1.9.2.1
@@ -159,3 +159,4 @@
   SET(SDL_FOUND "YES")
 ENDIF(SDL_LIBRARY_TEMP)
 
+MARK_AS_ADVANCED(SDL_LIBRARY_TEMP)

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.25.2.6
retrieving revision 1.25.2.7
diff -u -d -r1.25.2.6 -r1.25.2.7
--- FindQt4.cmake	30 Jun 2006 17:48:42 -0000	1.25.2.6
+++ FindQt4.cmake	13 Oct 2006 14:52:01 -0000	1.25.2.7
@@ -19,6 +19,9 @@
 #                    QT_USE_QTOPENGL
 #                    QT_USE_QTSQL
 #                    QT_USE_QTXML
+#                    QT_USE_QTSVG
+#                    QT_USE_QTTEST
+#                    QT_USE_QTUITOOLS
 #
 # All the libraries required are stored in a variable called QT_LIBRARIES.  
 # Add this variable to your TARGET_LINK_LIBRARIES.
@@ -45,6 +48,7 @@
 #  QT_QTXML_FOUND         True if QtXml was found.
 #  QT_QTSVG_FOUND         True if QtSvg was found.
 #  QT_QTTEST_FOUND        True if QtTest was found.
+#  QT_QTUITOOLS_FOUND     True if QtUiTools was found.
 #                      
 #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
 #                  
@@ -167,26 +171,48 @@
 
 SET( QT_DEFINITIONS "")
 
-IF (WIN32)
-  SET(QT_DEFINITIONS -DQT_DLL)
-ENDIF(WIN32)
-
 # check for qmake
 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)
 
+##  macro for asking qmake to process pro files
+MACRO(QT_QUERY_QMAKE outvar invar)
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
+    "message(CMAKE_MESSAGE<$$${invar}>)")
+  EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
+    WORKING_DIRECTORY  
+    ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
+    OUTPUT_VARIABLE _qmake_query_output
+    ERROR_VARIABLE _qmake_query_output )
+  FILE(REMOVE_RECURSE 
+    "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
+  STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
+ENDMACRO(QT_QUERY_QMAKE)
+
 
 IF (QT_QMAKE_EXECUTABLE)
 
    SET(QT4_QMAKE_FOUND FALSE)
    
    EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
-
+  # check for qt3 qmake and then try and find qmake-qt4 in the path
+  IF("${QTVERSION}" MATCHES "Unknown")
+    SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
+    FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES 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
+      )
+    IF(QT_QMAKE_EXECUTABLE)
+      EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} 
+        ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+    ENDIF(QT_QMAKE_EXECUTABLE)
+  ENDIF("${QTVERSION}" MATCHES "Unknown")
    # check that we found the Qt4 qmake, Qt3 qmake output won't match here
    STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
    IF (qt_version_tmp)
@@ -226,7 +252,6 @@
       ELSE (found_vers LESS req_vers)
     SET(QT4_QMAKE_FOUND TRUE)
       ENDIF (found_vers LESS req_vers)
-
    ENDIF (qt_version_tmp)
 
 ENDIF (QT_QMAKE_EXECUTABLE)
@@ -391,7 +416,7 @@
     )
 
   # Set QT_QTUITOOLS_INCLUDE_DIR
-  FIND_PATH(QT_QTUITOOLS_INCLUDE_DIR QtTest
+  FIND_PATH(QT_QTUITOOLS_INCLUDE_DIR QtUiTools
     PATHS
     ${QT_INCLUDE_DIR}/QtUiTools
     ${QT_LIBRARY_DIR}/QtUiTools.framework/Headers
@@ -467,11 +492,9 @@
   # Set QT_INCLUDES
   SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
 
-
-    
     # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore."  as part of the filename
     FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
-    FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore_debug QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore_debug QtCored QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     # Set QT_QT3SUPPORT_LIBRARY
     FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_RELEASE NAMES Qt3Support Qt3Support4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
@@ -523,7 +546,7 @@
 
   IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
     IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-      MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check CMakeFiles/CMakeError.log for more details.")
+      MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
     ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
   ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
 
@@ -535,6 +558,14 @@
   FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
   FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_DEBUG   NAMES QtDesigner_debug QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
+  # Set QT_QTMAIN_LIBRARY
+  IF(WIN32)
+    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR}
+      NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR}
+      NO_DEFAULT_PATH)
+  ENDIF(WIN32)
+
   ############################################
   #
   # Check the existence of the libraries.
@@ -557,13 +588,16 @@
         SET(QT_${basename}_LIBRARY         ${QT_${basename}_LIBRARY_DEBUG})
         SET(QT_${basename}_LIBRARIES       ${QT_${basename}_LIBRARY_DEBUG})
       ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
-
       IF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
-        IF(NOT MSVC)
-        SET(QT_${basename}_LIBRARY         ${QT_${basename}_LIBRARY_RELEASE})
-        ELSE(NOT MSVC)
+        # if the generator supports configuration types then set
+        # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+        IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
           SET(QT_${basename}_LIBRARY       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
-        ENDIF(NOT MSVC)
+        ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+          # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+          # then just use the release libraries
+          SET(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE} )
+        ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
         SET(QT_${basename}_LIBRARIES       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
       ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
 
@@ -582,7 +616,10 @@
   ENDMACRO (_QT4_ADJUST_LIB_VARS)
 
   IF(WIN32)
+    # there is no include for qtmain but adjust macro needs it set
+    SET(QT_QTMAIN_INCLUDE_DIR 1)
      _QT4_ADJUST_LIB_VARS(QTMAIN)
+    SET(QT_QTMAIN_INCLUDE_DIR )
   ENDIF(WIN32)
 
 
@@ -603,6 +640,8 @@
   _QT4_ADJUST_LIB_VARS(QTUITOOLS)
   _QT4_ADJUST_LIB_VARS(QTTEST)
 
+
+
   #######################################
   #
   #       Check the executables of Qt 
@@ -612,23 +651,8 @@
 
 
    # find moc and uic using qmake
-   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
-    "message(MOC<$$QMAKE_MOC>)
-      message(UIC<$$QMAKE_UIC>)
-   ")
-
-   EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
-      WORKING_DIRECTORY  
-      ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
-      OUTPUT_VARIABLE _moc_OUTPUT
-      ERROR_VARIABLE _moc_OUTPUT )
-   FILE(REMOVE_RECURSE 
-     "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
-
-   STRING(REGEX REPLACE 
-     ".*MOC<([^>]+).*" "\\1" QT_MOC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
-   STRING(REGEX REPLACE 
-     ".*UIC<([^>]+).*" "\\1" QT_UIC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
+  QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
+  QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
 
    FILE(TO_CMAKE_PATH 
      "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
@@ -820,22 +844,141 @@
   ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE)
   SET(QT_FOUND ${QT4_FOUND})
 
-
   #######################################
   #
-  #       System dependent settings  
+  #       Qt configuration
   #
   #######################################
-  # for unix add X11 stuff
-  IF(UNIX)
-    # on OS X X11 may not be required
-    IF (Q_WS_X11)
-    FIND_PACKAGE(X11)
-    ENDIF (Q_WS_X11)
-    FIND_PACKAGE(Threads)
-    SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(UNIX)
+  IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
+    FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
+    STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents})
+    STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents})
+  ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
+
 
+  ###############################################
+  #
+  #       configuration/system dependent settings  
+  #
+  ###############################################
+
+  SET(QT_GUI_LIB_DEPENDENCIES "")
+  SET(QT_CORE_LIB_DEPENDENCIES "")
+  
+  # shared build needs -DQT_SHARED
+  IF(NOT QT_CONFIG MATCHES "static")
+    # warning currently only qconfig.pri on Windows potentially contains "static"
+    # so QT_SHARED might not get defined properly on Mac/X11 (which seems harmless right now)
+    # Trolltech said they'd consider exporting it for all platforms in future releases.
+    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
+  ENDIF(NOT QT_CONFIG MATCHES "static")
+  
+  ## system png
+  IF(QT_QCONFIG MATCHES "system-png")
+    FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
+    MARK_AS_ADVANCED(QT_PNG_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "system-png")
+  
+  # for X11, get X11 library directory
+  IF(Q_WS_X11)
+    QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
+  ENDIF(Q_WS_X11)
+
+  ## X11 SM
+  IF(QT_QCONFIG MATCHES "x11sm")
+    # ask qmake where the x11 libs are
+    FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
+    FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
+    MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
+    MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "x11sm")
+  
+  ## Xi
+  IF(QT_QCONFIG MATCHES "tablet")
+    FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
+    MARK_AS_ADVANCED(QT_XI_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "tablet")
+
+  ## Xrender
+  IF(QT_QCONFIG MATCHES "xrender")
+    FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
+    MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "xrender")
+  
+  ## Xrandr
+  IF(QT_QCONFIG MATCHES "xrandr")
+    FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
+    MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "xrandr")
+  
+  ## Xcursor
+  IF(QT_QCONFIG MATCHES "xcursor")
+    FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
+    MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "xcursor")
+  
+  ## Xinerama
+  IF(QT_QCONFIG MATCHES "xinerama")
+    FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
+    MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "xinerama")
+  
+  ## system-freetype
+  IF(QT_QCONFIG MATCHES "system-freetype")
+    FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
+    MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "system-freetype")
+  
+  ## fontconfig
+  IF(QT_QCONFIG MATCHES "fontconfig")
+    FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
+    MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "fontconfig")
+  
+  ## system-zlib
+  IF(QT_QCONFIG MATCHES "system-zlib")
+    FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
+    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
+    MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
+  ENDIF(QT_QCONFIG MATCHES "system-zlib")
+
+  IF(Q_WS_X11)
+    # X11 libraries Qt absolutely depends on
+    QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
+    SEPARATE_ARGUMENTS(QT_LIBS_X11)
+    FOREACH(QT_X11_LIB ${QT_LIBS_X11})
+      STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
+      SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
+      FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
+      SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
+    ENDFOREACH(QT_X11_LIB)
+
+    QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
+    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
+    
+    QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
+    SET (QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
+
+  ENDIF(Q_WS_X11)
+
+  IF(Q_WS_WIN)
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} Imm32 Winmm)
+    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} Ws2_32)
+  ENDIF(Q_WS_WIN)
+  
+  IF(Q_WS_MAC)
+    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime")
+    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
+  ENDIF(Q_WS_MAC)
 
   #######################################
   #

Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- InstallRequiredSystemLibraries.cmake	10 Apr 2006 17:46:37 -0000	1.3
+++ InstallRequiredSystemLibraries.cmake	13 Oct 2006 14:52:01 -0000	1.3.2.1
@@ -17,9 +17,20 @@
       )
   ENDIF(MSVC71)
   IF(MSVC80)
+    # Find the runtime library redistribution directory.
+    FIND_PATH(MSVC80_REDIST_DIR NAMES x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
+      PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist"
+      )
+    MARK_AS_ADVANCED(MSVC80_REDIST_DIR)
+    SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.CRT")
+
+    # Install the manifest that allows DLLs to be loaded from the
+    # directory containing the executable.
     SET(__install__libs
-      "${SYSTEMROOT}/system32/msvcp80.dll"
-      "${SYSTEMROOT}/system32/msvcr80.dll"
+      "${MSVC80_CRT_DIR}/Microsoft.VC80.CRT.manifest"
+      "${MSVC80_CRT_DIR}/msvcm80.dll"
+      "${MSVC80_CRT_DIR}/msvcp80.dll"
+      "${MSVC80_CRT_DIR}/msvcr80.dll"
       )
   ENDIF(MSVC80)
   IF(CMAKE_INSTALL_MFC_LIBRARIES)
@@ -34,8 +45,12 @@
         )
     ENDIF(MSVC71)
     IF(MSVC80)
+      SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFC")
+      # Install the manifest that allows DLLs to be loaded from the
+      # directory containing the executable.
       SET(__install__libs ${__install__libs}
-        "${SYSTEMROOT}/system32/mfc80.dll"
+        "${MSVC80_MFC_DIR}/Microsoft.VC80.MFC.manifest"
+        "${MSVC80_MFC_DIR}/mfc80.dll"
         )
     ENDIF(MSVC80)
   ENDIF(CMAKE_INSTALL_MFC_LIBRARIES)

Index: CMakeDetermineRCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineRCCompiler.cmake,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- CMakeDetermineRCCompiler.cmake	30 Jun 2006 17:48:42 -0000	1.5.2.1
+++ CMakeDetermineRCCompiler.cmake	13 Oct 2006 14:52:01 -0000	1.5.2.2
@@ -25,18 +25,18 @@
     ENDIF(NOT CMAKE_RC_COMPILER_INIT)
   ENDIF(CMAKE_GENERATOR_RC)
   
-  
-  # if no compiler has been specified yet, then look for one
-  IF(NOT CMAKE_RC_COMPILER_INIT)
+  # finally list compilers to try
+  IF(CMAKE_RC_COMPILER_INIT)
+    SET(CMAKE_RC_COMPILER_LIST ${CMAKE_RC_COMPILER_INIT})
+  ELSE(CMAKE_RC_COMPILER_INIT)
     SET(CMAKE_RC_COMPILER_LIST rc)
-    FIND_PROGRAM(CMAKE_RC_COMPILER_FULLPATH NAMES ${CMAKE_RC_COMPILER_LIST} )
-    GET_FILENAME_COMPONENT(CMAKE_RC_COMPILER_INIT
-      ${CMAKE_RC_COMPILER_FULLPATH} NAME)
-    SET(CMAKE_RC_COMPILER_FULLPATH "${CMAKE_RC_COMPILER_FULLPATH}" 
-      CACHE INTERNAL "full path to the compiler cmake found")
-  ENDIF(NOT CMAKE_RC_COMPILER_INIT)
+  ENDIF(CMAKE_RC_COMPILER_INIT)
 
-  SET(CMAKE_RC_COMPILER ${CMAKE_RC_COMPILER_INIT} CACHE STRING "RC compiler")
+  # Find the compiler.
+  FIND_PROGRAM(CMAKE_RC_COMPILER NAMES ${CMAKE_RC_COMPILER_LIST} DOC "RC compiler")
+  IF(CMAKE_RC_COMPILER_INIT AND NOT CMAKE_RC_COMPILER)
+    SET(CMAKE_RC_COMPILER "${CMAKE_RC_COMPILER_INIT}" CACHE FILEPATH "RC compiler" FORCE)
+  ENDIF(CMAKE_RC_COMPILER_INIT AND NOT CMAKE_RC_COMPILER)
 ENDIF(NOT CMAKE_RC_COMPILER)
 
 MARK_AS_ADVANCED(CMAKE_RC_COMPILER)  

Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- CMakeCXXInformation.cmake	11 Apr 2006 20:55:48 -0000	1.12
+++ CMakeCXXInformation.cmake	13 Oct 2006 14:52:01 -0000	1.12.2.1
@@ -72,10 +72,6 @@
   SET(CMAKE_SHARED_MODULE_CXX_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
 ENDIF(NOT CMAKE_SHARED_MODULE_CXX_FLAGS)
 
-IF(NOT CMAKE_SHARED_MODULE_LINK_CXX_FLAGS)
-  SET(CMAKE_SHARED_MODULE_LINK_CXX_FLAGS ${CMAKE_SHARED_MODULE_LINK_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_LINK_CXX_FLAGS)
-
 IF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG)
   SET(CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_FLAG}) 
 ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG)
@@ -84,6 +80,18 @@
   SET(CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_FLAG_SEP})
 ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP)
 
+# Initialize CXX link type selection flags from C versions.
+FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
+  IF(NOT CMAKE_${type}_LINK_STATIC_CXX_FLAGS)
+    SET(CMAKE_${type}_LINK_STATIC_CXX_FLAGS
+      ${CMAKE_${type}_LINK_STATIC_C_FLAGS})
+  ENDIF(NOT CMAKE_${type}_LINK_STATIC_CXX_FLAGS)
+  IF(NOT CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS)
+    SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS
+      ${CMAKE_${type}_LINK_DYNAMIC_C_FLAGS})
+  ENDIF(NOT CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS)
+ENDFOREACH(type)
+
 # add the flags to the cache based
 # on the initial values computed in the platform/*.cmake files
 # use _INIT variables so that this only happens the first time

Index: UseEcos.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseEcos.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- UseEcos.cmake	25 Apr 2006 16:09:11 -0000	1.1.2.1
+++ UseEcos.cmake	13 Oct 2006 14:52:01 -0000	1.1.2.2
@@ -1,10 +1,13 @@
 # - This module defines variables and macros required to build eCos application.
 # This file contains the following macros:
 # ECOS_ADD_INCLUDE_DIRECTORIES() - add the eCos include dirs
+# ECOS_ADD_EXECUTABLE(name source1 ... sourceN ) - create an eCos executable
+# ECOS_ADJUST_DIRECTORY(VAR source1 ... sourceN ) - adjusts the path of the source files and puts the result into VAR
+#
+# Macros for selecting the toolchain:
 # ECOS_USE_ARM_ELF_TOOLS()       - enable the ARM ELF toolchain for the directory where it is called
+# ECOS_USE_I386_ELF_TOOLS()      - enable the i386 ELF toolchain for the directory where it is called
 # ECOS_USE_PPC_EABI_TOOLS()      - enable the PowerPC toolchain for the directory where it is called
-# ECOS_ADD_EXECUTABLE(name source1 ... sourceN ) - create an executable for eCos
-# ECOS_ADJUST_DIRECTORY(source1 ... sourceN )
 #
 # It contains the following variables:
 # ECOS_DEFINITIONS
@@ -78,6 +81,21 @@
    SET(ECOS_ARCH_PREFIX "powerpc-eabi-")
 ENDMACRO (ECOS_USE_PPC_EABI_TOOLS)
 
+#usage: ECOS_USE_I386_ELF_TOOLS()
+MACRO (ECOS_USE_I386_ELF_TOOLS)
+   SET(CMAKE_CXX_COMPILER "i386-elf-c++")
+   SET(CMAKE_COMPILER_IS_GNUCXX 1)
+   SET(CMAKE_C_COMPILER "i386-elf-gcc")
+   SET(CMAKE_AR "i386-elf-ar")
+   SET(CMAKE_RANLIB "i386-elf-ranlib")
+#for linking
+   SET(ECOS_LD_MCPU "")
+#for compiling
+   ADD_DEFINITIONS()
+#for the obj-tools
+   SET(ECOS_ARCH_PREFIX "i386-elf-")
+ENDMACRO (ECOS_USE_I386_ELF_TOOLS)
+
 
 #since the actual sources are located one level upwards
 #a "../" has to be prepended in front of every source file
@@ -150,20 +168,14 @@
    SET(CMAKE_C_LINK_EXECUTABLE  "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <OBJECTS>  -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib  -nostartfiles -L${CMAKE_CURRENT_SOURCE_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}")
 
    ADD_EXECUTABLE(${_exe_NAME} ${ARGN})
-
-#under win32 the ".exe" suffix is appended to the binary name, copy it so that it exists also without the prefix
-#otherwise the following custom commands don't work
-   IF(WIN32)
-      ADD_CUSTOM_COMMAND(TARGET ${_exe_NAME} POST_BUILD COMMAND cp ARGS ${_exe_NAME}.exe ${_exe_NAME}_ )
-      ADD_CUSTOM_COMMAND(TARGET ${_exe_NAME} POST_BUILD COMMAND mv ARGS ${_exe_NAME}_ ${_exe_NAME} )
-   ENDIF(WIN32)
+   SET_TARGET_PROPERTIES(${_exe_NAME} PROPERTIES SUFFIX ".elf")
 
 #create a binary file
    ADD_CUSTOM_COMMAND(
       TARGET ${_exe_NAME}
       POST_BUILD
       COMMAND ${ECOS_ARCH_PREFIX}objcopy
-      ARGS -O binary ${_exe_NAME} ${_exe_NAME}.bin
+      ARGS -O binary ${_exe_NAME}.elf ${_exe_NAME}.bin
    )
 
 #and an srec file
@@ -171,11 +183,11 @@
       TARGET ${_exe_NAME}
       POST_BUILD
       COMMAND ${ECOS_ARCH_PREFIX}objcopy
-      ARGS -O srec ${_exe_NAME} ${_exe_NAME}.srec
+      ARGS -O srec ${_exe_NAME}.elf ${_exe_NAME}.srec
    )
 
 #add the created files to the make_clean_files
-   SET(ECOS_ADD_MAKE_CLEAN_FILES ${ECOS_ADD_MAKE_CLEAN_FILES};${_exe_NAME};${_exe_NAME}.bin;${_exe_NAME}.srec;${_exe_NAME}.lst;)
+   SET(ECOS_ADD_MAKE_CLEAN_FILES ${ECOS_ADD_MAKE_CLEAN_FILES};${_exe_NAME}.bin;${_exe_NAME}.srec;${_exe_NAME}.lst;)
 
    SET_DIRECTORY_PROPERTIES(
       PROPERTIES
@@ -192,11 +204,11 @@
 
    ADD_CUSTOM_TARGET( listing
       COMMAND echo -e   \"\\n--- Symbols sorted by address ---\\n\" > ${_exe_NAME}.lst
-      COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -n ${_exe_NAME} >> ${_exe_NAME}.lst
+      COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -n ${_exe_NAME}.elf >> ${_exe_NAME}.lst
       COMMAND echo -e \"\\n--- Symbols sorted by size ---\\n\" >> ${_exe_NAME}.lst
-      COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -r --size-sort ${_exe_NAME} >> ${_exe_NAME}.lst
+      COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -r --size-sort ${_exe_NAME}.elf >> ${_exe_NAME}.lst
       COMMAND echo -e \"\\n--- Full assembly listing ---\\n\" >> ${_exe_NAME}.lst
-      COMMAND ${ECOS_ARCH_PREFIX}objdump -S -x -d -C ${_exe_NAME} >> ${_exe_NAME}.lst )
+      COMMAND ${ECOS_ARCH_PREFIX}objdump -S -x -d -C ${_exe_NAME}.elf >> ${_exe_NAME}.lst )
 
 ENDMACRO(ECOS_ADD_EXECUTABLE)
 

Index: FindRuby.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindRuby.cmake,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- FindRuby.cmake	15 Dec 2005 19:17:42 -0000	1.5
+++ FindRuby.cmake	13 Oct 2006 14:52:01 -0000	1.5.2.1
@@ -1,34 +1,54 @@
-# - Find ruby
-# This module finds if RUBY is installed and determines where the include files
+# - Find Ruby
+# This module finds if Ruby is installed and determines where the include files
 # and libraries are. It also determines what the name of the library is. This
 # code sets the following variables:
 #
 #  RUBY_INCLUDE_PATH = path to where ruby.h can be found
 #  RUBY_EXECUTABLE   = full path to the ruby binary
-#
 
-SET(RUBY_POSSIBLE_INCLUDE_PATHS
-  /usr/lib/ruby/1.8/i386-linux
-  )
+# Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
+# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
 
-SET(RUBY_POSSIBLE_LIB_PATHS
-  /usr/lib
-  )
 
-FIND_PATH(RUBY_INCLUDE_PATH ruby.h
-  ${RUBY_POSSIBLE_INCLUDE_PATHS})
+if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+   # Already in cache, be silent
+   set(RUBY_FIND_QUIETLY TRUE)
+endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
 
-FIND_LIBRARY(RUBY_LIBRARY
-  NAMES ruby1.8
-  PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-  )
+#   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+#   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+#   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+#   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
+#   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
 
-FIND_PROGRAM(RUBY_EXECUTABLE
-  NAMES ruby1.8
+FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 )
+
+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']"
+   OUTPUT_VARIABLE RUBY_ARCH_DIR)
+
+
+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
+   OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH)
+
+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
+   OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH)
+
+# remove the new lines from the output by replacing them with empty strings
+STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
+STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
+STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
+
+
+FIND_PATH(RUBY_INCLUDE_PATH
+   NAMES ruby.h
   PATHS
-  /usr/bin
-  /usr/local/bin
-)
+   ${RUBY_ARCH_DIR}
+  /usr/lib/ruby/1.8/i586-linux-gnu/ )
+
+FIND_LIBRARY(RUBY_LIBRARY
+  NAMES ruby
+  PATHS ${RUBY_POSSIBLE_LIB_PATH}
+  )
 
 MARK_AS_ADVANCED(
   RUBY_EXECUTABLE

Index: readme.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/readme.txt,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- readme.txt	24 Jul 2006 15:19:34 -0000	1.7.2.1
+++ readme.txt	13 Oct 2006 14:52:01 -0000	1.7.2.2
@@ -16,7 +16,7 @@
 XXX_YY_FOUND           	If False, optional YY part of XXX sytem is not available.
 XXX_FOUND              	Set to false, or undefined, if we haven't found, or don't want to use XXX.
 
-You do not have to provide all of the above variables. You should provide XXX_FOUND under most circumstances. If XXX is a library, then  XXX_LIBRARIES, should also be defined, and XXX_INCLUDE_DIR should usually be defined (I guess libm.a might be an exception)
+You do not have to provide all of the above variables. You should provide XXX_FOUND under most circumstances. If XXX is a library, then  XXX_LIBRARIES, should also be defined, and XXX_INCLUDE_DIRS should usually be defined (I guess libm.a might be an exception)
 
 The following names should not usually be used in CMakeLists.txt files, but they may be usefully modified in users' CMake Caches to control stuff.
 

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- UseQt4.cmake	28 Apr 2006 12:59:48 -0000	1.3.2.1
+++ UseQt4.cmake	13 Oct 2006 14:52:01 -0000	1.3.2.2
@@ -10,209 +10,82 @@
 
 SET(QT_LIBRARIES "")
 
-IF (NOT QT_DONT_USE_QTCORE)
-  IF (QT_QTCORE_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DQT_CORE_LIB)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTCORE_LIBRARY}"
-        debug "${QT_QTCORE_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTCORE_LIBRARY}" )
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    IF (UNIX)
-      IF (CMAKE_DL_LIBS)
-        SET (QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_DL_LIBS})
-      ENDIF (CMAKE_DL_LIBS)
-    ENDIF (UNIX)
-  ELSE (QT_QTCORE_FOUND)
-    MESSAGE("QtCore library not found.")
-  ENDIF (QT_QTCORE_FOUND)
-ENDIF (NOT QT_DONT_USE_QTCORE)
+IF (QT_USE_QTMAIN)
+  IF (WIN32)
+    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+  ENDIF (WIN32)
+ENDIF (QT_USE_QTMAIN)
 
-IF (NOT QT_DONT_USE_QTGUI)
-  IF (QT_QTGUI_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTGUI_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DQT_GUI_LIB)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTGUI_LIBRARY}"
-        debug "${QT_QTGUI_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTGUI_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    IF (UNIX)
-      IF (X11_FOUND)
-        SET (QT_LIBRARIES ${QT_LIBRARIES} ${X11_LIBRARIES})
-      ENDIF (X11_FOUND)
-    ENDIF (UNIX)
-  ELSE (QT_QTGUI_FOUND)
-    MESSAGE("QtGui library not found.")
-  ENDIF (QT_QTGUI_FOUND)
-ENDIF (NOT QT_DONT_USE_QTGUI)
+# Macro for setting up compile flags for Qt modules
+MACRO(QT_MODULE_SETUP module)
+  IF (QT_QT${module}_FOUND)
+    ADD_DEFINITIONS(-DQT_${module}_LIB)
+    INCLUDE_DIRECTORIES(${QT_QT${module}_INCLUDE_DIR})
+    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT${module}_LIBRARY})
+    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
+  ELSE (QT_QT${module}_FOUND)
+    MESSAGE("Qt ${module} library not found.")
+  ENDIF (QT_QT${module}_FOUND)
+ENDMACRO(QT_MODULE_SETUP)
+
+
+# Qt modules  (in order of dependence)
 
 IF (QT_USE_QT3SUPPORT)
-  IF (QT_QT3SUPPORT_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QT3SUPPORT_INCLUDE_DIR})
+  QT_MODULE_SETUP(3SUPPORT)
     ADD_DEFINITIONS(-DQT3_SUPPORT)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QT3SUPPORT_LIBRARY}"
-        debug "${QT_QT3SUPPORT_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QT3SUPPORT_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QT3SUPPORT_FOUND)
-    MESSAGE("Qt3Support library not found.")
-  ENDIF (QT_QT3SUPPORT_FOUND)
 ENDIF (QT_USE_QT3SUPPORT)
 
+IF (QT_USE_QTOPENGL)
+  QT_MODULE_SETUP(OPENGL)
+ENDIF (QT_USE_QTOPENGL)
+
 IF (QT_USE_QTASSISTANT)
-  IF (QT_QTASSISTANT_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTASSISTANT_INCLUDE_DIR})
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTASSISTANT_LIBRARY}"
-        debug "${QT_QTASSISTANT_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTASSISTANT_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTASSISTANT_FOUND)
-    MESSAGE("QtAssistant library not found.")
-  ENDIF (QT_QTASSISTANT_FOUND)
+  QT_MODULE_SETUP(ASSISTANT)
 ENDIF (QT_USE_QTASSISTANT)
 
 IF (QT_USE_QTDESIGNER)
-  IF (QT_QTDESIGNER_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTDESIGNER_LIBRARY}"
-        debug "${QT_QTDESIGNER_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTDESIGNER_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTDESIGNER_FOUND)
-    MESSAGE("QtDesigner library not found.")
-  ENDIF (QT_QTDESIGNER_FOUND)
+  QT_MODULE_SETUP(DESIGNER)
 ENDIF (QT_USE_QTDESIGNER)
 
-IF (QT_USE_QTMAIN)
-  IF (WIN32)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
- optimized "${QT_QTMAIN_LIBRARY}"
- debug "${QT_QTMAIN_LIBRARY_DEBUG}"
- )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTMAIN_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ENDIF (WIN32)
-ENDIF (QT_USE_QTMAIN)
-
 IF (QT_USE_QTMOTIF)
-  IF (QT_QTMOTIF_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTMOTIF_INCLUDE_DIR})
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTMOTIF_LIBRARY}"
-        debug "${QT_QTMOTIF_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTMOTIF_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTMOTIF_FOUND)
-    MESSAGE("QtMotif library not found.")
-  ENDIF (QT_QTMOTIF_FOUND)
+  QT_MODULE_SETUP(MOTIF)
 ENDIF (QT_USE_QTMOTIF)
 
-IF (QT_USE_QTNETWORK)
-  IF (QT_QTNETWORK_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTNETWORK_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DQT_NETWORK_LIB)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTNETWORK_LIBRARY}"
-        debug "${QT_QTNETWORK_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTNETWORK_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTNETWORK_FOUND)
-    MESSAGE("QtNetwork library not found.")
-  ENDIF (QT_QTNETWORK_FOUND)
-ENDIF (QT_USE_QTNETWORK)
-
 IF (QT_USE_QTNSPLUGIN)
-  IF (QT_QTNSPLUGIN_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTNSPLUGIN_INCLUDE_DIR})
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTNSPLUGIN_LIBRARY}"
-        debug "${QT_QTNSPLUGIN_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTNSPLUGIN_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTNSPLUGIN_FOUND)
-    MESSAGE("QtNsPlugin library not found.")
-  ENDIF (QT_QTNSPLUGIN_FOUND)
+  QT_MODULE_SETUP(NSPLUGIN)
 ENDIF (QT_USE_QTNSPLUGIN)
 
-IF (QT_USE_QTOPENGL)
-  IF (QT_QTOPENGL_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTOPENGL_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DQT_OPENGL_LIB)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTOPENGL_LIBRARY}"
-        debug "${QT_QTOPENGL_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTOPENGL_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTOPENGL_FOUND)
-    MESSAGE("QtOpenGL library not found.")
-  ENDIF (QT_QTOPENGL_FOUND)
-ENDIF (QT_USE_QTOPENGL)
+IF (QT_USE_QTSVG)
+  QT_MODULE_SETUP(SVG)
+ENDIF (QT_USE_QTSVG)
 
-IF (QT_USE_QTSQL)
-  IF (QT_QTSQL_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTSQL_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DQT_SQL_LIB)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTSQL_LIBRARY}"
-        debug "${QT_QTSQL_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTSQL_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTSQL_FOUND)
-    MESSAGE("QtSql library not found.")
-  ENDIF (QT_QTSQL_FOUND)
-ENDIF (QT_USE_QTSQL)
+IF (QT_USE_QTUITOOLS)
+  QT_MODULE_SETUP(UITOOLS)
+ENDIF (QT_USE_QTUITOOLS)
+
+IF (NOT QT_DONT_USE_QTGUI)
+  QT_MODULE_SETUP(GUI)
+ENDIF (NOT QT_DONT_USE_QTGUI)
+
+IF (QT_USE_QTTEST)
+  QT_MODULE_SETUP(TEST)
+ENDIF (QT_USE_QTTEST)
 
 IF (QT_USE_QTXML)
-  IF (QT_QTXML_FOUND)
-    INCLUDE_DIRECTORIES(${QT_QTXML_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DQT_XML_LIB)
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES}
-        optimized "${QT_QTXML_LIBRARY}"
-        debug "${QT_QTXML_LIBRARY_DEBUG}"
-        )
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTXML_LIBRARY}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-  ELSE (QT_QTXML_FOUND)
-    MESSAGE("QtXml library not found.")
-  ENDIF (QT_QTXML_FOUND)
+  QT_MODULE_SETUP(XML)
 ENDIF (QT_USE_QTXML)
 
+IF (QT_USE_QTSQL)
+  QT_MODULE_SETUP(SQL)
+ENDIF (QT_USE_QTSQL)
+
+IF (QT_USE_QTNETWORK)
+  QT_MODULE_SETUP(NETWORK)
+ENDIF (QT_USE_QTNETWORK)
+
+IF (NOT QT_DONT_USE_QTCORE)
+  QT_MODULE_SETUP(CORE)
+ENDIF (NOT QT_DONT_USE_QTCORE)
+
+

Index: kde3uic.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/kde3uic.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- kde3uic.cmake	30 Jun 2006 17:48:43 -0000	1.1.2.1
+++ kde3uic.cmake	13 Oct 2006 14:52:01 -0000	1.1.2.2
@@ -5,7 +5,7 @@
 
 
 EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
-   -nounload -tr tr2i18n
+   -L ${KDE_UIC_PLUGIN_DIR} -nounload -tr tr2i18n
    -impl ${KDE_UIC_H_FILE}
    ${KDE_UIC_FILE}
    OUTPUT_VARIABLE _uic_CONTENTS

Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- CMakeFortranInformation.cmake	11 Apr 2006 20:55:48 -0000	1.12
+++ CMakeFortranInformation.cmake	13 Oct 2006 14:52:01 -0000	1.12.2.1
@@ -63,10 +63,6 @@
   SET(CMAKE_SHARED_MODULE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
 ENDIF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS)
 
-IF(NOT CMAKE_SHARED_MODULE_LINK_Fortran_FLAGS)
-  SET(CMAKE_SHARED_MODULE_LINK_Fortran_FLAGS ${CMAKE_SHARED_MODULE_LINK_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_LINK_Fortran_FLAGS)
-
 IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
   SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG}) 
 ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)

Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- FindDoxygen.cmake	28 Feb 2006 15:27:30 -0000	1.7
+++ FindDoxygen.cmake	13 Oct 2006 14:52:01 -0000	1.7.2.1
@@ -1,41 +1,79 @@
-# - this module looks for Doxygen and the path to Graphiz's dot
+# - This module looks for Doxygen and the path to Graphiz's dot
+# Doxygen is a documentation generation tool see http://www.doxygen.org
 # With the OS X GUI version, it likes to be installed to /Applications and
 # it contains the doxygen executable in the bundle. In the versions I've 
 # seen, it is located in Resources, but in general, more often binaries are 
 # located in MacOS.
-FIND_PROGRAM(DOXYGEN
-  doxygen
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin"
+IF (NOT DOXYGEN_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for doxygen...")
+ENDIF (NOT DOXYGEN_FIND_QUIETLY)
+
+FIND_PROGRAM(DOXYGEN_EXECUTABLE
+  NAMES doxygen
+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin"
   /Applications/Doxygen.app/Contents/Resources
   /Applications/Doxygen.app/Contents/MacOS
+  DOC "Doxygen documentation generation tool (http://www.doxygen.org)"
 )
 
+IF (DOXYGEN_EXECUTABLE)
+  SET (DOXYGEN_FOUND "YES")
+  IF (NOT DOXYGEN_FIND_QUIETLY)
+    MESSAGE(STATUS "Looking for doxygen... - found ${DOXYGEN_EXECUTABLE}")
+  ENDIF (NOT DOXYGEN_FIND_QUIETLY)
+ELSE (DOXYGEN_EXECUTABLE)
+  IF (NOT DOXYGEN_FIND_QUIETLY)
+    IF (DOXYGEN_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Looking for doxygen... - NOT found")
+    ELSE (DOXYGEN_FIND_REQUIRED)
+      MESSAGE(STATUS "Looking for doxygen... - NOT found")
+    ENDIF (DOXYGEN_FIND_REQUIRED)
+  ENDIF (NOT DOXYGEN_FIND_QUIETLY)
+ENDIF (DOXYGEN_EXECUTABLE)
+
 # In the older versions of OS X Doxygen, dot was included with the 
 # Doxygen bundle. But the new versions place make you download Graphviz.app
 # which contains dot in its bundle.
-FIND_PROGRAM(DOT
-  dot
-  "$ENV{ProgramFiles}/ATT/Graphviz/bin"
+IF (NOT DOXYGEN_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for dot tool...")
+ENDIF (NOT DOXYGEN_FIND_QUIETLY)
+
+FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE
+  NAMES dot
+  PATHS "$ENV{ProgramFiles}/ATT/Graphviz/bin"
   "C:/Program Files/ATT/Graphviz/bin"
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
   /Applications/Graphviz.app/Contents/MacOS
   /Applications/Doxygen.app/Contents/Resources
   /Applications/Doxygen.app/Contents/MacOS
+  DOC "Graphiz Dot tool for using Doxygen"
 )
 
+IF (NOT DOXYGEN_FIND_QUIETLY)
+  IF (DOXYGEN_DOT_EXECUTABLE)
+    MESSAGE(STATUS "Looking for dot tool... - found ${DOXYGEN_DOT_EXECUTABLE}")
+  ELSE (DOXYGEN_DOT_EXECUTABLE)
+    MESSAGE(STATUS "Looking for dot tool... - NOT found")
+  ENDIF (DOXYGEN_DOT_EXECUTABLE)
+ENDIF (NOT DOXYGEN_FIND_QUIETLY)
+
+
 # The Doxyfile wants the path to Dot, not the entire path and executable
-# so for convenience, I'll add another search for DOT_PATH.
-FIND_PATH(DOT_PATH
+# so for convenience, I'll add another search for DOXYGEN_DOT_PATH.
+FIND_PATH(DOXYGEN_DOT_PATH
   dot
   "C:/Program Files/ATT/Graphviz/bin"
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
   /Applications/Graphviz.app/Contents/MacOS
   /Applications/Doxygen.app/Contents/Resources
   /Applications/Doxygen.app/Contents/MacOS
+  DOC "Path to the Graphviz Dot tool"
 )
 
 MARK_AS_ADVANCED(
-  DOT
-  DOT_PATH
-  DOXYGEN
-)
+  DOXYGEN_FOUND,
+  DOXYGEN_EXECUTABLE,
+  DOXYGEN_DOT_FOUND,
+  DOXYGEN_DOT_EXECUTABLE,
+  DOXYGEN_DOT_PATH,
+  )

Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- FindPythonLibs.cmake	24 Mar 2006 19:47:25 -0000	1.26
+++ FindPythonLibs.cmake	13 Oct 2006 14:52:01 -0000	1.26.2.1
@@ -12,8 +12,10 @@
 
 IF(WIN32)
   FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-    NAMES python24_d python23_d python22_d python21_d python20_d python
+    NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
     PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs/Debug
@@ -32,7 +34,8 @@
 ENDIF(WIN32)
 
 FIND_LIBRARY(PYTHON_LIBRARY
-  NAMES python24 python2.4
+  NAMES python25 python2.5
+        python24 python2.4
         python23 python2.3
         python22 python2.2
         python21 python2.1
@@ -41,6 +44,7 @@
         python15 python1.5
 
   PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
@@ -50,6 +54,7 @@
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
 
   PATH_SUFFIXES
+    python2.5/config
     python2.4/config
     python2.3/config
     python2.2/config
@@ -67,7 +72,7 @@
 SET(PYTHON_FRAMEWORK_INCLUDES)
 IF(Python_FRAMEWORKS)
   IF(NOT PYTHON_INCLUDE_PATH)
-    FOREACH(version 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+    FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
       FOREACH(dir ${Python_FRAMEWORKS})
         SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
           ${dir}/Versions/${version}/include/python${version})
@@ -81,6 +86,7 @@
 
   PATHS
     ${PYTHON_FRAMEWORK_INCLUDES}
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
@@ -90,6 +96,7 @@
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
 
   PATH_SUFFIXES
+    python2.5
     python2.4
     python2.3
     python2.2

Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -d -r1.27.2.2 -r1.27.2.3
--- CMakeDetermineCXXCompiler.cmake	24 Jul 2006 15:19:34 -0000	1.27.2.2
+++ CMakeDetermineCXXCompiler.cmake	13 Oct 2006 14:52:01 -0000	1.27.2.3
@@ -28,17 +28,18 @@
     ENDIF(NOT CMAKE_CXX_COMPILER_INIT)
   ENDIF(CMAKE_GENERATOR_CXX)
 
-  # if no compiler has been found yet, then try to find one
-  IF(NOT CMAKE_CXX_COMPILER_INIT)
-  # if not in the envionment then search for the compiler in the path
+  # finally list compilers to try
+  IF(CMAKE_CXX_COMPILER_INIT)
+    SET(CMAKE_CXX_COMPILER_LIST ${CMAKE_CXX_COMPILER_INIT})
+  ELSE(CMAKE_CXX_COMPILER_INIT)
     SET(CMAKE_CXX_COMPILER_LIST c++ g++ CC aCC cl bcc xlC)
-    FIND_PROGRAM(CMAKE_CXX_COMPILER_FULLPATH NAMES ${CMAKE_CXX_COMPILER_LIST})
-    GET_FILENAME_COMPONENT(CMAKE_CXX_COMPILER_INIT
-                           ${CMAKE_CXX_COMPILER_FULLPATH} NAME)
-    SET(CMAKE_CXX_COMPILER_FULLPATH "${CMAKE_CXX_COMPILER_FULLPATH}" CACHE INTERNAL "full path to the compiler cmake found")
-  ENDIF(NOT CMAKE_CXX_COMPILER_INIT)
-  SET(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER_INIT} 
-      CACHE STRING "C++ compiler") 
+  ENDIF(CMAKE_CXX_COMPILER_INIT)
+
+  # Find the compiler.
+  FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES ${CMAKE_CXX_COMPILER_LIST} DOC "C++ compiler")
+  IF(CMAKE_CXX_COMPILER_INIT AND NOT CMAKE_CXX_COMPILER)
+    SET(CMAKE_CXX_COMPILER "${CMAKE_CXX_COMPILER_INIT}" CACHE FILEPATH "C++ compiler" FORCE)
+  ENDIF(CMAKE_CXX_COMPILER_INIT AND NOT CMAKE_CXX_COMPILER)
 ENDIF(NOT CMAKE_CXX_COMPILER)
 MARK_AS_ADVANCED(CMAKE_CXX_COMPILER)
 

Index: KDE3Macros.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/KDE3Macros.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- KDE3Macros.cmake	30 Jun 2006 17:48:43 -0000	1.2.2.1
+++ KDE3Macros.cmake	13 Oct 2006 14:52:01 -0000	1.2.2.2
@@ -1,4 +1,4 @@
-
+#
 
 # See FindKDE3.cmake for documentation.
 #
@@ -36,9 +36,10 @@
 
           ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
           COMMAND ${KDE3_DCOPIDL_EXECUTABLE}
-          ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} > ${_kidl}
+          ARGS ${_tmp_FILE} > ${_kidl}
           DEPENDS ${_tmp_FILE}
          )
+         
        ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
 
       IF (NOT HAVE_${_basename}_SKEL_RULE)
@@ -75,8 +76,8 @@
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
            COMMAND ${KDE3_DCOPIDL_EXECUTABLE}
-           ARGS ${tmp_FILE} > ${_kidl}
-           DEPENDS ${tmp_FILE}
+           ARGS ${_tmp_FILE} > ${_kidl}
+           DEPENDS ${_tmp_FILE}
            )
 
       ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
@@ -163,13 +164,14 @@
 
       ADD_CUSTOM_COMMAND(OUTPUT ${_header}
          COMMAND ${QT_UIC_EXECUTABLE}
-         ARGS  -nounload -o ${_header} ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
+         ARGS  -L ${KDE3_LIB_DIR}/kde3/plugins/designer -nounload -o ${_header} ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
          DEPENDS ${_tmp_FILE}
       )
 
       ADD_CUSTOM_COMMAND(OUTPUT ${_src}
          COMMAND ${CMAKE_COMMAND}
          ARGS
+         -DKDE_UIC_PLUGIN_DIR:FILEPATH=${KDE3_LIB_DIR}/kde3/plugins/designer
          -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
          -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
          -DKDE_UIC_CPP_FILE:FILEPATH=${_src}
@@ -236,49 +238,64 @@
    ENDFOREACH (_current_FILE)
 ENDMACRO(KDE3_AUTOMOC)
 
+# only used internally by KDE3_INSTALL_ICONS
+MACRO (_KDE3_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME)
 
-MACRO(KDE3_INSTALL_ICONS _theme)
-   ADD_CUSTOM_TARGET(install_icons )
-   SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake )
-   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n")
-   FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n")
-
-   FILE(GLOB _icons *.png)
-   FOREACH(_current_ICON ${_icons} )
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}")
-
+   # if the string doesn't match the pattern, the result is the full string, so all three have the same content
+   IF (NOT ${_group} STREQUAL ${_install_NAME} )
       SET(_icon_GROUP "actions")
 
-      IF(${_group} STREQUAL "mime")
+      IF (${_group} STREQUAL "mime")
          SET(_icon_GROUP  "mimetypes")
-      ENDIF(${_group} STREQUAL "mime")
+      ENDIF (${_group} STREQUAL "mime")
 
-      IF(${_group} STREQUAL "filesys")
+      IF (${_group} STREQUAL "filesys")
          SET(_icon_GROUP  "filesystems")
-      ENDIF(${_group} STREQUAL "filesys")
+      ENDIF (${_group} STREQUAL "filesys")
 
-      IF(${_group} STREQUAL "device")
+      IF (${_group} STREQUAL "device")
          SET(_icon_GROUP  "devices")
-      ENDIF(${_group} STREQUAL "device")
+      ENDIF (${_group} STREQUAL "device")
 
-      IF(${_group} STREQUAL "app")
+      IF (${_group} STREQUAL "app")
          SET(_icon_GROUP  "apps")
-      ENDIF(${_group} STREQUAL "app")
+      ENDIF (${_group} STREQUAL "app")
 
-      IF(${_group} STREQUAL "action")
+      IF (${_group} STREQUAL "action")
          SET(_icon_GROUP  "actions")
-      ENDIF(${_group} STREQUAL "action")
+      ENDIF (${_group} STREQUAL "action")
 
 #      message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
-      SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
-      FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
-      FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
+   INSTALL(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/ RENAME ${_install_NAME} )
+   ENDIF (NOT ${_group} STREQUAL ${_install_NAME} )
+
+ENDMACRO (_KDE3_ADD_ICON_INSTALL_RULE)
 
+
+MACRO (KDE3_INSTALL_ICONS _theme )
+   SET(_defaultpath "${CMAKE_INSTALL_PREFIX}/share/icons")
+   # first the png icons
+   FILE(GLOB _icons *.png)
+   FOREACH (_current_ICON ${_icons} )
+      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size  "${_current_ICON}")
+      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
+      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name  "${_current_ICON}")
+      _KDE3_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
+         ${_defaultpath}/${_theme}/${_size}x${_size}
+         ${_group} ${_current_ICON} ${_name})
    ENDFOREACH (_current_ICON)
-ENDMACRO(KDE3_INSTALL_ICONS)
 
+   # and now the svg icons
+   FILE(GLOB _icons *.svgz)
+   FOREACH (_current_ICON ${_icons} )
+      STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\1" _group "${_current_ICON}")
+      STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\2" _name "${_current_ICON}")
+      _KDE3_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
+                                 ${_defaultpath}/${_theme}/scalable
+                                 ${_group} ${_current_ICON} ${_name})
+   ENDFOREACH (_current_ICON)
+
+ENDMACRO (KDE3_INSTALL_ICONS)
 
 MACRO(KDE3_INSTALL_LIBTOOL_FILE _target)
    GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)

Index: CheckCSourceCompiles.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckCSourceCompiles.cmake,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- CheckCSourceCompiles.cmake	30 Jun 2006 17:48:42 -0000	1.6.2.3
+++ CheckCSourceCompiles.cmake	13 Oct 2006 14:52:01 -0000	1.6.2.4
@@ -2,7 +2,7 @@
 # CHECK_C_SOURCE_COMPILES(SOURCE VAR)
 # - macro which checks if the source code compiles
 #  SOURCE   - source code to try to compile
-#  VAR - variable to store size if the type exists.
+#  VAR      - variable to store whether the source code compiled
 #
 # The following variables may be set before calling this macro to
 # modify the way the check is run:
@@ -41,16 +41,16 @@
       "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"
       OUTPUT_VARIABLE OUTPUT)
     IF(${VAR})
-      SET(${VAR} 1 CACHE INTERNAL "Test ${FUNCTION}")
+      SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
       MESSAGE(STATUS "Performing Test ${VAR} - Success")
-      FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log 
+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
         "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     ELSE(${VAR})
       MESSAGE(STATUS "Performing Test ${VAR} - Failed")
-      SET(${VAR} "" CACHE INTERNAL "Test ${FUNCTION}")
-      FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log 
+      SET(${VAR} "" CACHE INTERNAL "Test ${VAR}")
+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")

Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -d -r1.2.6.1 -r1.2.6.2
--- FindwxWidgets.cmake	24 Jul 2006 15:19:34 -0000	1.2.6.1
+++ FindwxWidgets.cmake	13 Oct 2006 14:52:01 -0000	1.2.6.2
@@ -539,8 +539,8 @@
       SET(wxWidgets_FOUND TRUE)
 
       # run the wx-config program to get cxxflags
-      EXEC_PROGRAM(${wxWidgets_CONFIG_EXECUTABLE}
-        ARGS "--cxxflags"
+      EXEC_PROGRAM(sh
+        ARGS "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags"
         OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
         RETURN_VALUE RET)
       IF(RET EQUAL 0)
@@ -583,8 +583,8 @@
       #         be useful here...
       #STRING(REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
       STRING(REGEX REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
-      EXEC_PROGRAM(${wxWidgets_CONFIG_EXECUTABLE}
-        ARGS "--libs ${wxWidgets_USE_LIBS}"
+      EXEC_PROGRAM(sh
+        ARGS "${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_USE_LIBS}"
         OUTPUT_VARIABLE wxWidgets_LIBRARIES
         RETURN_VALUE RET)
       IF(RET EQUAL 0)

Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- FindKDE3.cmake	21 Mar 2006 17:56:01 -0000	1.3
+++ FindKDE3.cmake	13 Oct 2006 14:52:01 -0000	1.3.2.1
@@ -5,7 +5,7 @@
 # KDE3_INCLUDE_DIR         - the KDE include directory
 # KDE3_INCLUDE_DIRS        - the KDE and the Qt include directory, for use with INCLUDE_DIRECTORIES()
 # KDE3_LIB_DIR             - the directory where the KDE libraries are installed, for use with LINK_DIRECTORIES()
-# QT_AND_KDECORE_LIBRARIES - this contains both the Qt and the kdecore library
+# QT_AND_KDECORE_LIBS      - this contains both the Qt and the kdecore library
 # KDE3_DCOPIDL_EXECUTABLE  - the dcopidl executable
 # KDE3_DCOPIDL2CPP_EXECUTABLE - the dcopidl2cpp executable
 # KDE3_KCFGC_EXECUTABLE    - the kconfig_compiler executable
@@ -98,56 +98,101 @@
 #SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
 #SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
 
+# all calls to FIND_PROGRAM/PATH/LIBRARY() follow the same scheme:
+# at first try some special paths with the argument "NO_DEFAULT_PATH"
+# so only these paths are checked
+# this is followed by a second call to FIND_PROGRAM/PATH/LIBRARY()
+# but this time without any paths and without NO_DEFAULT_PATH
+# this second call will do nothing if the first call already found
+# what it was looking for, if not, it will search only in the default
+# directories (/usr, /usr/local, etc.)
+
 #now try to find some kde stuff
+FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config PATHS
+   $ENV{KDEDIR}/bin
+  /opt/kde3/bin
+  /opt/kde/bin
+  NO_DEFAULT_PATH
+  )
 
-#at first the KDE include direcory
+
+FIND_PROGRAM(KDECONFIG_EXECUTABLE kde-config)
+
+
+SET(KDE3PREFIX)
+IF(KDECONFIG_EXECUTABLE)
+   EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --version
+                   OUTPUT_VARIABLE kde_config_version )
+
+   STRING(REGEX MATCH "KDE: .\\." kde_version ${kde_config_version})
+   IF (${kde_version} MATCHES "KDE: 3\\.")
+      EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --prefix
+                        OUTPUT_VARIABLE kdedir )
+      STRING(REGEX REPLACE "\n" "" KDE3PREFIX "${kdedir}")
+
+    ENDIF (${kde_version} MATCHES "KDE: 3\\.")
+ENDIF(KDECONFIG_EXECUTABLE)
+
+
+
+# at first the KDE include direcory
 # kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
 FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
   $ENV{KDEDIR}/include
-  /opt/kde/include
+  ${KDE3PREFIX}/include
   /opt/kde3/include
-  /usr/local/include
-  /usr/include/
+  /opt/kde/include
   /usr/include/kde
   /usr/local/include/kde
-)
+  NO_DEFAULT_PATH
+  )
+
+FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h)
 
 #now the KDE library directory
 FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
   PATHS
   $ENV{KDEDIR}/lib
-  /opt/kde/lib
+  ${KDE3PREFIX}/lib
   /opt/kde3/lib
-  /usr/lib
-  /usr/local/lib
+  /opt/kde/lib
+  NO_DEFAULT_PATH
 )
 
-GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
+FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore)
 
-#now the KDE service types directory
-#FIND_PATH(KDE3_SERVICETYPES_DIR ktexteditor.desktop
-#  $ENV{KDEDIR}/share/servicetypes/
-#  /opt/kde/share/servicetypes/
-#  /opt/kde3/share/servicetypes/
-#)
+GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
 
 #now search for the dcop utilities
-FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAME dcopidl PATHS
+FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl PATHS
   $ENV{KDEDIR}/bin
-  /opt/kde/bin
+  ${KDE3PREFIX}/bin
   /opt/kde3/bin
+  /opt/kde/bin
+  NO_DEFAULT_PATH
   )
 
-FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAME dcopidl2cpp PATHS
+FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl)
+
+FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp PATHS
   $ENV{KDEDIR}/bin
+  ${KDE3PREFIX}/bin
+  /opt/kde3/bin
   /opt/kde/bin
-  /opt/kde3/bin)
+  NO_DEFAULT_PATH
+  )
 
-FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS
+FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp)
+
+FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler PATHS
   $ENV{KDEDIR}/bin
+  ${KDE3PREFIX}/bin
+  /opt/kde3/bin
   /opt/kde/bin
-  /opt/kde3/bin)
+  NO_DEFAULT_PATH
+  )
 
+FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler)
 
 # KDE3Macros.cmake contains all the KDE specific macros
 INCLUDE(KDE3Macros)

Index: FindGLUT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGLUT.cmake,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- FindGLUT.cmake	15 Dec 2005 15:41:19 -0000	1.17
+++ FindGLUT.cmake	13 Oct 2006 14:52:01 -0000	1.17.2.1
@@ -45,7 +45,7 @@
       /System/Library/Frameworks/GLUT.framework/Versions/A/Headers
       ${OPENGL_LIBRARY_DIR}
     )
-    SET(GLUT_glut_LIBRARY "-framework Glut" CACHE STRING "GLUT library for OSX") 
+    SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX") 
     SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
   ELSE (APPLE)
 

Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- CMakeDetermineCCompiler.cmake	30 Jun 2006 17:48:42 -0000	1.35.2.2
+++ CMakeDetermineCCompiler.cmake	13 Oct 2006 14:52:01 -0000	1.35.2.3
@@ -28,17 +28,18 @@
     ENDIF(NOT CMAKE_C_COMPILER_INIT)
   ENDIF(CMAKE_GENERATOR_CC)
 
-  # if no compiler has been specified yet, then look for one
-  IF(NOT CMAKE_C_COMPILER_INIT)
-  # if not in the envionment then search for the compiler in the path
+  # finally list compilers to try
+  IF(CMAKE_C_COMPILER_INIT)
+    SET(CMAKE_C_COMPILER_LIST ${CMAKE_C_COMPILER_INIT})
+  ELSE(CMAKE_C_COMPILER_INIT)
     SET(CMAKE_C_COMPILER_LIST gcc cc cl bcc xlc)  
-    FIND_PROGRAM(CMAKE_C_COMPILER_FULLPATH NAMES ${CMAKE_C_COMPILER_LIST} )
-    GET_FILENAME_COMPONENT(CMAKE_C_COMPILER_INIT
-                           ${CMAKE_C_COMPILER_FULLPATH} NAME)
-    SET(CMAKE_C_COMPILER_FULLPATH "${CMAKE_C_COMPILER_FULLPATH}" CACHE INTERNAL "full path to the compiler cmake found")
-  ENDIF(NOT CMAKE_C_COMPILER_INIT)
+  ENDIF(CMAKE_C_COMPILER_INIT)
 
-  SET(CMAKE_C_COMPILER ${CMAKE_C_COMPILER_INIT} CACHE STRING "C compiler")
+  # Find the compiler.
+  FIND_PROGRAM(CMAKE_C_COMPILER NAMES ${CMAKE_C_COMPILER_LIST} DOC "C compiler")
+  IF(CMAKE_C_COMPILER_INIT AND NOT CMAKE_C_COMPILER)
+    SET(CMAKE_C_COMPILER "${CMAKE_C_COMPILER_INIT}" CACHE FILEPATH "C compiler" FORCE)
+  ENDIF(CMAKE_C_COMPILER_INIT AND NOT CMAKE_C_COMPILER)
 ENDIF(NOT CMAKE_C_COMPILER)
 MARK_AS_ADVANCED(CMAKE_C_COMPILER)  
 GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_C_COMPILER}"

Index: CheckCXXSourceCompiles.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckCXXSourceCompiles.cmake,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- CheckCXXSourceCompiles.cmake	30 Jun 2006 17:48:42 -0000	1.8.2.3
+++ CheckCXXSourceCompiles.cmake	13 Oct 2006 14:52:01 -0000	1.8.2.4
@@ -1,8 +1,8 @@
 # - Check if the source code provided in the SOURCE argument compiles.
 # CHECK_CXX_SOURCE_COMPILES(SOURCE VAR)
-# - macro which checks if the source code compiles\
+# - macro which checks if the source code compiles
 #  SOURCE - source code to try to compile
-#  VAR    - variable to store size if the type exists.
+#  VAR    - variable to store whether the source code compiled
 #
 # The following variables may be set before calling this macro to
 # modify the way the check is run:
@@ -41,7 +41,7 @@
       "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}"
       OUTPUT_VARIABLE OUTPUT)
     IF(${VAR})
-      SET(${VAR} 1 CACHE INTERNAL "Test ${FUNCTION}")
+      SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
       MESSAGE(STATUS "Performing Test ${VAR} - Success")
       FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
         "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
@@ -49,7 +49,7 @@
         "Source file was:\n${SOURCE}\n")
     ELSE(${VAR})
       MESSAGE(STATUS "Performing Test ${VAR} - Failed")
-      SET(${VAR} "" CACHE INTERNAL "Test ${FUNCTION}")
+      SET(${VAR} "" CACHE INTERNAL "Test ${VAR}")
       FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
         "Performing C++ SOURCE FILE Test ${VAR} failed with the following output:\n"
         "${OUTPUT}\n"

Index: CMakeDetermineFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineFortranCompiler.cmake,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- CMakeDetermineFortranCompiler.cmake	30 Jun 2006 17:48:42 -0000	1.10.2.1
+++ CMakeDetermineFortranCompiler.cmake	13 Oct 2006 14:52:01 -0000	1.10.2.2
@@ -25,10 +25,10 @@
     ENDIF(NOT CMAKE_Fortran_COMPILER_INIT)
   ENDIF(CMAKE_GENERATOR_FC)
   
-  
-  # if no compiler has been specified yet, then look for one
-  IF(NOT CMAKE_Fortran_COMPILER_INIT)
-    # if not in the envionment then search for the compiler in the path
+  # finally list compilers to try
+  IF(CMAKE_Fortran_COMPILER_INIT)
+    SET(CMAKE_Fortran_COMPILER_LIST ${CMAKE_Fortran_COMPILER_INIT})
+  ELSE(CMAKE_Fortran_COMPILER_INIT)
     # Known compilers:
     #  f77/f90/f95: generic compiler names
     #  g77: GNU Fortran 77 compiler
@@ -51,16 +51,17 @@
     # NOTE for testing purposes this list is DUPLICATED in
     # CMake/Source/CMakeLists.txt, IF YOU CHANGE THIS LIST,
     # PLEASE UPDATE THAT FILE AS WELL!
-    SET(CMAKE_Fortran_COMPILER_LIST ifort ifc efc f95 pgf95
-          lf95 xlf95 fort gfortran f90  pgf90   xlf90   epcf90 fort77 frt pgf77  xlf  fl32 af77 g77 f77  )
-    FIND_PROGRAM(CMAKE_Fortran_COMPILER_FULLPATH NAMES ${CMAKE_Fortran_COMPILER_LIST} )
-    GET_FILENAME_COMPONENT(CMAKE_Fortran_COMPILER_INIT
-      ${CMAKE_Fortran_COMPILER_FULLPATH} NAME)
-    SET(CMAKE_Fortran_COMPILER_FULLPATH "${CMAKE_Fortran_COMPILER_FULLPATH}" 
-      CACHE INTERNAL "full path to the compiler cmake found")
-  ENDIF(NOT CMAKE_Fortran_COMPILER_INIT)
+    SET(CMAKE_Fortran_COMPILER_LIST
+      ifort ifc efc f95 pgf95 lf95 xlf95 fort gfortran f90
+      pgf90 xlf90 epcf90 fort77 frt pgf77 xlf fl32 af77 g77 f77
+      )
+  ENDIF(CMAKE_Fortran_COMPILER_INIT)
 
-  SET(CMAKE_Fortran_COMPILER ${CMAKE_Fortran_COMPILER_INIT} CACHE STRING "Fortran compiler")
+  # Find the compiler.
+  FIND_PROGRAM(CMAKE_Fortran_COMPILER NAMES ${CMAKE_Fortran_COMPILER_LIST} DOC "Fortran compiler")
+  IF(CMAKE_Fortran_COMPILER_INIT AND NOT CMAKE_Fortran_COMPILER)
+    SET(CMAKE_Fortran_COMPILER "${CMAKE_Fortran_COMPILER_INIT}" CACHE FILEPATH "Fortran compiler" FORCE)
+  ENDIF(CMAKE_Fortran_COMPILER_INIT AND NOT CMAKE_Fortran_COMPILER)
 ENDIF(NOT CMAKE_Fortran_COMPILER)
 
 MARK_AS_ADVANCED(CMAKE_Fortran_COMPILER)  

Index: FindPNG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPNG.cmake,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- FindPNG.cmake	20 Mar 2006 17:29:56 -0000	1.13
+++ FindPNG.cmake	13 Oct 2006 14:52:01 -0000	1.13.2.1
@@ -12,10 +12,13 @@
 # PNG depends on Zlib
 INCLUDE(FindZLIB)
 
+SET(PNG_FOUND "NO")
+
 IF(ZLIB_FOUND)
   FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
   /usr/local/include
   /usr/include
+  /usr/local/include/libpng             # OpenBSD
   )
 
   SET(PNG_NAMES ${PNG_NAMES} png libpng)
@@ -42,4 +45,14 @@
 
 ENDIF(ZLIB_FOUND)
 
+IF (PNG_FOUND)
+  IF (NOT PNG_FIND_QUIETLY)
+    MESSAGE(STATUS "Found PNG: ${PNG_LIBRARY}")
+  ENDIF (NOT PNG_FIND_QUIETLY)
+ELSE (PNG_FOUND)
+  IF (PNG_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find PNG library")
+  ENDIF (PNG_FIND_REQUIRED)
+ENDIF (PNG_FOUND)
+
 MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )

Index: CMakeSystemSpecificInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- CMakeSystemSpecificInformation.cmake	16 Mar 2006 22:07:36 -0000	1.35
+++ CMakeSystemSpecificInformation.cmake	13 Oct 2006 14:52:01 -0000	1.35.2.1
@@ -30,7 +30,6 @@
 IF(NOT CMAKE_MODULE_EXISTS)
   SET(CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
   SET(CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  SET(CMAKE_SHARED_MODULE_LINK_C_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
   SET(CMAKE_SHARED_MODULE_RUNTIME_C_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
   SET(CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
 ENDIF(NOT CMAKE_MODULE_EXISTS)

Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- FindTCL.cmake	9 Mar 2006 16:35:38 -0000	1.39
+++ FindTCL.cmake	13 Oct 2006 14:52:01 -0000	1.39.2.1
@@ -137,8 +137,9 @@
     ${TCLTK_POSSIBLE_INCLUDE_PATHS}
   )
   MARK_AS_ADVANCED(TK_INTERNAL_PATH)
+ENDIF(WIN32)
 
-  MARK_AS_ADVANCED(
+MARK_AS_ADVANCED(
     TCL_TCLSH_PATH
     TK_WISH_PATH
     TCL_INCLUDE_PATH
@@ -147,13 +148,10 @@
     TCL_LIBRARY_DEBUG
     TK_LIBRARY  
     TK_LIBRARY_DEBUG
-    )
-ENDIF(WIN32)
-
-MARK_AS_ADVANCED(
   TCL_STUB_LIBRARY
   TCL_STUB_LIBRARY_DEBUG
   TK_STUB_LIBRARY  
+  TK_STUB_LIBRARY
   TK_STUB_LIBRARY_DEBUG
   )
 

Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- FindQt3.cmake	9 May 2006 20:30:45 -0000	1.10.2.2
+++ FindQt3.cmake	13 Oct 2006 14:52:01 -0000	1.10.2.3
@@ -28,10 +28,9 @@
   $ENV{QTDIR}/include
   ${GLOB_PATHS_BIN}
   /usr/local/qt/include
-  /usr/local/include
   /usr/lib/qt/include
+  /usr/lib/qt3/include
   /usr/include/qt
-  /usr/include
   /usr/share/qt3/include
   C:/Progra~1/qt/include
   /usr/include/qt3
@@ -61,7 +60,7 @@
   FIND_LIBRARY(QT_QT_LIBRARY
     NAMES
     qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
-    qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321
+    qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
     PATHS
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
@@ -69,9 +68,9 @@
     $ENV{QTDIR}/lib
     ${GLOB_PATHS_LIB}
     /usr/local/qt/lib
-    /usr/local/lib
     /usr/lib/qt/lib
-    /usr/lib
+    /usr/lib/qt3/lib
+    /usr/lib/qt3/lib64
     /usr/share/qt3/lib
     C:/Progra~1/qt/lib
     /usr/X11R6/lib
@@ -82,7 +81,7 @@
     NAMES 
     qt qt-${qt_version_str_lib} qt-edu${qt_version_str_lib} 
     qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
-    qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321
+    qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
     PATHS
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
@@ -90,9 +89,9 @@
     $ENV{QTDIR}/lib
     ${GLOB_PATHS_LIB}
     /usr/local/qt/lib
-    /usr/local/lib
     /usr/lib/qt/lib
-    /usr/lib
+    /usr/lib/qt3/lib
+    /usr/lib/qt3/lib64
     /usr/share/qt3/lib
     C:/Progra~1/qt/lib
     /usr/X11R6/lib
@@ -113,8 +112,8 @@
   $ENV{QTDIR}/lib
   ${GLOB_PATHS_LIB}
   /usr/local/qt/lib
-  /usr/local/lib
-  /usr/lib
+  /usr/lib/qt3/lib
+  /usr/lib/qt3/lib64
   /usr/share/qt3/lib
   C:/Progra~1/qt/lib
   /usr/X11R6/lib
@@ -138,6 +137,7 @@
   ${GLOB_PATHS_BIN}
   /usr/local/qt/bin
   /usr/lib/qt/bin
+  /usr/lib/qt3/bin
   /usr/share/qt3/bin
   C:/Progra~1/qt/bin
   /usr/X11R6/bin
@@ -162,6 +162,7 @@
   ${GLOB_PATHS_BIN}
   /usr/local/qt/bin
   /usr/lib/qt/bin
+  /usr/lib/qt3/bin
   /usr/share/qt3/bin
   C:/Progra~1/qt/bin
   /usr/X11R6/bin

Index: UseSWIG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseSWIG.cmake,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- UseSWIG.cmake	15 Dec 2005 19:17:43 -0000	1.14
+++ UseSWIG.cmake	13 Oct 2006 14:52:01 -0000	1.14.2.1
@@ -12,6 +12,8 @@
 # special flags to all swig calls.
 # Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify 
 # where to write all the swig generated module (swig -outdir option)
+# The name-specific variable SWIG_MODULE_<name>_EXTRA_DEPS may be used
+# to specify extra dependencies for the generated modules.
 
 SET(SWIG_CXX_EXTENSION "cxx")
 SET(SWIG_EXTRA_LIBRARIES "")
@@ -145,6 +147,7 @@
       -o "${swig_generated_file_fullname}"
       "${swig_source_file_fullname}"
       MAIN_DEPENDENCY "${swig_source_file_fullname}"
+      DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
       COMMENT "Swig source") 
   ELSE(CMAKE_SWIG_OUTDIR)
     ADD_CUSTOM_COMMAND(
@@ -160,6 +163,7 @@
       -o "${swig_generated_file_fullname}"
       "${swig_source_file_fullname}"
       MAIN_DEPENDENCY "${swig_source_file_fullname}"
+      DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
       COMMENT "Swig source") 
   ENDIF(CMAKE_SWIG_OUTDIR)
   SET_SOURCE_FILES_PROPERTIES("${swig_generated_file_fullname}"



More information about the Cmake-commits mailing list