diff options
author | Brad King <brad.king@kitware.com> | 2013-07-16 17:59:22 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-16 17:59:22 (GMT) |
commit | 9c119b829dc0189c1ba5c4ae928b671340c7a085 (patch) | |
tree | 27c74222e61240652b71cc6121c83be75b647d5f /Tests/RunCMake/CMakeLists.txt | |
parent | 3573a94d729bb15d2a7c212a29ddbe012acd412b (diff) | |
parent | cb7f32f5b861fe115fa71f64500a5cbb0b643f1b (diff) | |
download | CMake-9c119b829dc0189c1ba5c4ae928b671340c7a085.zip CMake-9c119b829dc0189c1ba5c4ae928b671340c7a085.tar.gz CMake-9c119b829dc0189c1ba5c4ae928b671340c7a085.tar.bz2 |
Merge topic 'obsolete-qt4-macros'
cb7f32f Mark qt4_use_modules and qt4_automoc as obsolete.
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
-rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 843af0e..66ce3f1 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -104,6 +104,10 @@ find_package(Qt5Core QUIET) 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() if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]") add_RunCMake_test(include_external_msproject) |