[Cmake-commits] CMake branch, next, updated. v2.8.5-1329-g61df4ad

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  61df4ad584c7fe193628cd06f709b9008e77840d (commit)
       via  de30173d5b39d645f059272857054d1f80165141 (commit)
       via  b6fb213ed1431321fab0705beb3aae82f451dcc8 (commit)
      from  9595082c76d9df43d722489434378aba6002f579 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61df4ad584c7fe193628cd06f709b9008e77840d
commit 61df4ad584c7fe193628cd06f709b9008e77840d
Merge: 9595082 de30173
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jul 28 14:17:24 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 28 14:17:24 2011 -0400

    Merge topic 'qt4-use-check-cxx-symbol' into next
    
    de30173 Remove C compiler requirement from FindQt4.cmake
    b6fb213 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de30173d5b39d645f059272857054d1f80165141
commit de30173d5b39d645f059272857054d1f80165141
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jul 28 12:15:46 2011 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jul 28 12:15:46 2011 -0600

    Remove C compiler requirement from FindQt4.cmake
    
    Use the new check_cxx_symbol_exists instead of check_symbol_exists.
    Also remove a debug message from CheckSymbolExists.cmake.

diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index a62aa70..be7d658 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -40,7 +40,6 @@ MACRO(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
 ENDMACRO(CHECK_SYMBOL_EXISTS)
 
 MACRO(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
-message(STATUS "files: -${FILES}-")
   IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
     SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
     SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e592438..1ebd69d 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -352,7 +352,7 @@ IF(QT_QT_LIBRARY)
 ENDIF(QT_QT_LIBRARY)
 
 
-INCLUDE(CheckSymbolExists)
+INCLUDE(CheckCXXSymbolExists)
 INCLUDE(MacroAddFileDependencies)
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
@@ -715,19 +715,19 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
   # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
   SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
   # Check for Window system symbols (note: only one should end up being set)
-  CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
-  CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
-  CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
-  CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
+  CHECK_CXX_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
+  CHECK_CXX_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
+  CHECK_CXX_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
+  CHECK_CXX_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
   IF(Q_WS_MAC)
     IF(QT_QMAKE_CHANGED)
       UNSET(QT_MAC_USE_COCOA CACHE)
     ENDIF(QT_QMAKE_CHANGED)
-    CHECK_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA)
+    CHECK_CXX_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA)
   ENDIF(Q_WS_MAC)
 
   IF (QT_QTCOPY_REQUIRED)
-     CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
+     CHECK_CXX_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
      IF (NOT QT_IS_QTCOPY)
         MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found")
      ENDIF (NOT QT_IS_QTCOPY)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckSymbolExists.cmake   |    1 -
 Modules/FindQt4.cmake             |   14 +++++++-------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake