diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-04 18:34:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-04 18:34:54 (GMT) |
| commit | f748b59e2057d73a25448378442d70b420ed7698 (patch) | |
| tree | 0035234f8941db728f48c6485da9e5575aa34fbc /Tests/Qt4And5Automoc/CMakeLists.txt | |
| parent | 01a41bc98ca8f2451e69fde4ac513b57276809ff (diff) | |
| parent | 6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774 (diff) | |
| download | CMake-f748b59e2057d73a25448378442d70b420ed7698.zip CMake-f748b59e2057d73a25448378442d70b420ed7698.tar.gz CMake-f748b59e2057d73a25448378442d70b420ed7698.tar.bz2 | |
Merge topic 'fix-Qt-autogen'
6053ce22 QtAutogen: Make uic work even when the source is in a subdir.
1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
Diffstat (limited to 'Tests/Qt4And5Automoc/CMakeLists.txt')
| -rw-r--r-- | Tests/Qt4And5Automoc/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt index 61d5743..ad74961 100644 --- a/Tests/Qt4And5Automoc/CMakeLists.txt +++ b/Tests/Qt4And5Automoc/CMakeLists.txt @@ -2,8 +2,13 @@ cmake_minimum_required(VERSION 2.8.12) project(Qt4And5Automoc) -find_package(Qt4 REQUIRED) -find_package(Qt5Core REQUIRED) +if (QT_REVERSE_FIND_ORDER) + find_package(Qt5Core REQUIRED) + find_package(Qt4 REQUIRED) +else() + find_package(Qt4 REQUIRED) + find_package(Qt5Core REQUIRED) +endif() set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) |