[Cmake-commits] CMake branch, next, updated. v2.8.1-1397-gbd03294

[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  bd032940e0f403dfbce37b5356e1be5b5704fecc (commit)
       via  1f608718fccf33c659845b8215efc112d258695c (commit)
      from  4cfc78d0d862bc55a3cb95ba416937aff3170895 (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=bd032940e0f403dfbce37b5356e1be5b5704fecc
commit bd032940e0f403dfbce37b5356e1be5b5704fecc
Merge: 4cfc78d 1f60871
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Mon Jun 14 07:35:11 2010 -0600

    Merge branch 'remove-qmake-query' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f608718fccf33c659845b8215efc112d258695c
commit 1f608718fccf33c659845b8215efc112d258695c
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Sat Jun 12 13:00:08 2010 -0600

    Remove macro for querying qmake for qmake variables.
    
    Remove last place for querying qmake values.
    Also removed internal macro to support querying qmake.
    Depends on findthreads-irix topic.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index f2de4c9..654879e 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -360,34 +360,6 @@ SET( QT_DEFINITIONS "")
 
 SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
 
-#  macro for asking qmake to process pro files
-MACRO(QT_QUERY_QMAKE outvar invar)
-  IF(QT_QMAKE_EXECUTABLE)
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
-         "message(CMAKE_MESSAGE<$$${invar}>)")
-
-    # Invoke qmake with the tmp.pro program to get the desired
-    # information.  Use the same variable for both stdout and stderr
-    # to make sure we get the output on all platforms.
-    EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
-      WORKING_DIRECTORY  
-      ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
-      OUTPUT_VARIABLE _qmake_query_output
-      RESULT_VARIABLE _qmake_result
-      ERROR_VARIABLE _qmake_query_output )
-
-    FILE(REMOVE_RECURSE 
-         "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
-
-    IF(_qmake_result)
-      MESSAGE(WARNING " querying qmake for ${invar}.  qmake reported:\n${_qmake_query_output}")
-    ELSE(_qmake_result)
-      STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
-    ENDIF(_qmake_result)
-
-  ENDIF(QT_QMAKE_EXECUTABLE)
-ENDMACRO(QT_QUERY_QMAKE)
-
 GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
 # check for qmake
 # Debian uses qmake-qt4
diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake
index ccbc828..1d77c7a 100644
--- a/Modules/Qt4ConfigDependentSettings.cmake
+++ b/Modules/Qt4ConfigDependentSettings.cmake
@@ -301,8 +301,11 @@ IF(Q_WS_X11)
   # X11 libraries Qt always depends on
   SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xext_LIB} ${X11_X11_LIB})
 
-  QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
-  SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
+  set(CMAKE_THREAD_PREFER_PTHREADS 1)
+  find_package(Threads)
+  if(CMAKE_USE_PTHREADS_INIT)
+    SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT})
+  endif(CMAKE_USE_PTHREADS_INIT)
 
   SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_DL_LIBS})
 

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

Summary of changes:
 Modules/FindQt4.cmake                    |   28 ----------------------------
 Modules/Qt4ConfigDependentSettings.cmake |    7 +++++--
 2 files changed, 5 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake