kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'Qt4-qmake-IMPORTED' 

7d90d6c5 Qt4: Add IMPORTED executable for qmake.
This commit is contained in:
Brad King 2014-02-10 11:25:00 -05:00 committed by CMake Topic Stage
parent f67ab2a920 7d90d6c59e
commit d51dc24e2b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindQt4.cmake
View File

@ -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_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4)
_find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4) _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) if (QT_MOC_EXECUTABLE)
set(QT_WRAP_CPP "YES") set(QT_WRAP_CPP "YES")
endif () endif ()