diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-10 16:25:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-10 16:25:00 (GMT) |
| commit | d51dc24e2b18e5d0ba61eccd55e34fb729d765fa (patch) | |
| tree | 6acb5e07b076b9ca6a3d91e3f16b1f5b5ec219bb | |
| parent | f67ab2a920cfce8db31ce214a198670cab31470a (diff) | |
| parent | 7d90d6c59e5a536132f420370b074970e591f595 (diff) | |
| download | CMake-d51dc24e2b18e5d0ba61eccd55e34fb729d765fa.zip CMake-d51dc24e2b18e5d0ba61eccd55e34fb729d765fa.tar.gz CMake-d51dc24e2b18e5d0ba61eccd55e34fb729d765fa.tar.bz2 | |
Merge topic 'Qt4-qmake-IMPORTED'
7d90d6c5 Qt4: Add IMPORTED executable for qmake.
| -rw-r--r-- | Modules/FindQt4.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index e188c62..d0515c6 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1147,6 +1147,11 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4) _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4) + if (NOT TARGET Qt4::qmake) + add_executable(Qt4::qmake IMPORTED) + set_property(TARGET Qt4::qmake PROPERTY IMPORTED_LOCATION ${QT_QMAKE_EXECUTABLE}) + endif() + if (QT_MOC_EXECUTABLE) set(QT_WRAP_CPP "YES") endif () |