[Cmake-commits] [cmake-commits] hoffman committed GetPrerequisites.cmake 1.1.2.2 1.1.2.3 UseQt4.cmake 1.13.2.2 1.13.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	GetPrerequisites.cmake UseQt4.cmake 
Log Message:
ENH: merge in fixes from head RC 4


Index: GetPrerequisites.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/GetPrerequisites.cmake,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** GetPrerequisites.cmake	22 Sep 2008 14:05:17 -0000	1.1.2.2
--- GetPrerequisites.cmake	11 Nov 2008 21:52:21 -0000	1.1.2.3
***************
*** 70,76 ****
  
    if(NOT is_embedded)
!     if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
!       set(is_system 1)
!     endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
  
      if(WIN32)
--- 70,84 ----
  
    if(NOT is_embedded)
!     if(UNIX)
!       if("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
!         set(is_system 1)
!       endif("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
!     endif(UNIX)
! 
!     if(APPLE)
!       if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
!         set(is_system 1)
!       endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
!     endif(APPLE)
  
      if(WIN32)
***************
*** 407,411 ****
    if("${gp_tool}" STREQUAL "ldd")
      set(gp_cmd_args "")
!     set(gp_regex "^\t([\t ]+)[\t ].*${eol_char}$")
      set(gp_regex_cmp_count 1)
      set(gp_tool_known 1)
--- 415,419 ----
    if("${gp_tool}" STREQUAL "ldd")
      set(gp_cmd_args "")
!     set(gp_regex "^[\t ]*[^\t ]+ => ([^\t ]+).*${eol_char}$")
      set(gp_regex_cmp_count 1)
      set(gp_tool_known 1)

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C 2 -d -r1.13.2.2 -r1.13.2.3
*** UseQt4.cmake	23 May 2008 20:09:35 -0000	1.13.2.2
--- UseQt4.cmake	11 Nov 2008 21:52:22 -0000	1.13.2.3
***************
*** 42,46 ****
  SET(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
  SET(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTCORE)
! SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
  SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
  SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
--- 42,50 ----
  SET(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
  SET(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTCORE)
! IF(QT_QTDBUS_FOUND)
!   SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
! ELSE(QT_QTDBUS_FOUND)
!   SET(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE)
! ENDIF(QT_QTDBUS_FOUND)
  SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
  SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)