[cmake-commits] alex committed FindQt4.cmake 1.52 1.53
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jan 3 16:48:11 EST 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv11067
Modified Files:
FindQt4.cmake
Log Message:
STYLE: some more space to make it easier to read
Alex
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- FindQt4.cmake 3 Jan 2007 21:38:26 -0000 1.52
+++ FindQt4.cmake 3 Jan 2007 21:48:08 -0000 1.53
@@ -196,17 +196,20 @@
SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
-## macro for asking qmake to process pro files
+# 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)
More information about the Cmake-commits
mailing list