[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3080-gbedb892
Stephen Kelly
steveire at gmail.com
Sun Jul 14 04:02:32 EDT 2013
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 bedb8921093cfa70d6bddc010098b03f9492bf16 (commit)
via 53eecfedbc57a5a189a0a559b8a9d526e2c23d8d (commit)
via f20fcf927257c8b6b3f75815007204b00fa40167 (commit)
from 6b740d34be0b2051c17f2eaa64fcc6c7b5e4e70e (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=bedb8921093cfa70d6bddc010098b03f9492bf16
commit bedb8921093cfa70d6bddc010098b03f9492bf16
Merge: 6b740d3 53eecfe
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 14 04:02:30 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 14 04:02:30 2013 -0400
Merge topic 'obsolete-qt4-macros' into next
53eecfe Pass the QT_QMAKE_EXECUTABLE path to the RunCMake calls.
f20fcf9 Remove debugging code.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53eecfedbc57a5a189a0a559b8a9d526e2c23d8d
commit 53eecfedbc57a5a189a0a559b8a9d526e2c23d8d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 14 10:00:40 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 14 10:01:16 2013 +0200
Pass the QT_QMAKE_EXECUTABLE path to the RunCMake calls.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d3fad8f..71246e1 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -102,6 +102,7 @@ if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
add_RunCMake_test(IncompatibleQt)
endif()
if (QT4_FOUND)
+ set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
add_RunCMake_test(ObsoleteQtMacros)
endif()
diff --git a/Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake b/Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake
index fc16a81..eee2cc3 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake
@@ -1,4 +1,6 @@
include(RunCMake)
+set(RunCMake_TEST_OPTIONS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
+
run_cmake(UseModulesMacro-WARN)
run_cmake(AutomocMacro-WARN)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f20fcf927257c8b6b3f75815007204b00fa40167
commit f20fcf927257c8b6b3f75815007204b00fa40167
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 14 10:00:28 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 14 10:00:28 2013 +0200
Remove debugging code.
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
index 2d0ed8a..b90c665 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
@@ -1,5 +1,3 @@
-QMAKE_EXECUTABLE.*
-TESTQTVERSION.*
CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_use_modules function is obsolete. Use target_link_libraries with
IMPORTED targets instead.
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
index ff7aef5..e86a372 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
+++ b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
@@ -1,77 +1,4 @@
-function(QUERY_QMAKE VAR RESULT)
- execute_process(COMMAND "${QT_QMAKE_EXECUTABLE}" -query ${VAR}
- RESULT_VARIABLE return_code
- OUTPUT_VARIABLE output
- OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
- if(NOT return_code)
- file(TO_CMAKE_PATH "${output}" output)
- set(${RESULT} ${output} PARENT_SCOPE)
- endif()
-endfunction()
-
-function(get_version_components VERSION RESULT_MAJOR RESULT_MINOR RESULT_PATCH)
- string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
- string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
-
- set(${RESULT_MAJOR} ${QT_VERSION_MAJOR} PARENT_SCOPE)
- set(${RESULT_MINOR} ${QT_VERSION_MINOR} PARENT_SCOPE)
- set(${RESULT_PATCH} ${QT_VERSION_PATCH} PARENT_SCOPE)
-endfunction()
-
-function(test_find_qmake QMAKE_NAMES QMAKE_RESULT VERSION_RESULT)
- list(LENGTH QMAKE_NAMES QMAKE_NAMES_LEN)
- if(${QMAKE_NAMES_LEN} EQUAL 0)
- return()
- endif()
- list(GET QMAKE_NAMES 0 QMAKE_NAME)
-
- get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
-
- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
- PATHS
- ENV QTDIR
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
- PATH_SUFFIXES bin
- DOC "The qmake executable for the Qt installation to use"
- )
-
- set(major 0)
- if (QT_QMAKE_EXECUTABLE)
- query_qmake(QT_VERSION QTVERSION)
- get_version_components("${QTVERSION}" major minor patch)
- endif()
-
- if (NOT QT_QMAKE_EXECUTABLE OR NOT "${major}" EQUAL 4)
- set(curr_qmake "${QT_QMAKE_EXECUTABLE}")
- set(curr_qt_version "${QTVERSION}")
-
- set(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
- list(REMOVE_AT QMAKE_NAMES 0)
- test_find_qmake("${QMAKE_NAMES}" QMAKE QTVERSION)
-
- get_version_components("${QTVERSION}" major minor patch)
- if (NOT ${major} EQUAL 4)
- # Restore possibly found qmake and it's version; these are used later
- # in error message if incorrect version is found
- set(QT_QMAKE_EXECUTABLE "${curr_qmake}" CACHE FILEPATH "" FORCE)
- set(QTVERSION "${curr_qt_version}")
- endif()
-
- endif()
-
-
- set(${QMAKE_RESULT} "${QT_QMAKE_EXECUTABLE}" PARENT_SCOPE)
- set(${VERSION_RESULT} "${QTVERSION}" PARENT_SCOPE)
-endfunction()
-
-set(QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
-test_find_qmake("${QMAKE_NAMES}" QMAKE_EXECUTABLE TESTQTVERSION)
-
-message("QMAKE_EXECUTABLE : ${QMAKE_EXECUTABLE}")
-message("TESTQTVERSION : ${TESTQTVERSION}")
-
find_package(Qt4 REQUIRED)
set(CMAKE_WARN_DEPRECATED 1)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 1 +
Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake | 2 +
.../UseModulesMacro-WARN-stderr.txt | 2 -
.../ObsoleteQtMacros/UseModulesMacro-WARN.cmake | 73 --------------------
4 files changed, 3 insertions(+), 75 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list