diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-07-25 09:19:22 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-07-25 11:55:42 (GMT) |
| commit | 0f267c012b83f248d4d300dba4bd42152227b4e4 (patch) | |
| tree | c5d3381c626ea9d6a833d39597be6ba9df1ae9ae | |
| parent | 828ddb68139a080594c2e6a96d57cb9e93d2ccb3 (diff) | |
| download | CMake-0f267c012b83f248d4d300dba4bd42152227b4e4.zip CMake-0f267c012b83f248d4d300dba4bd42152227b4e4.tar.gz CMake-0f267c012b83f248d4d300dba4bd42152227b4e4.tar.bz2 | |
FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties
obsolete.
| -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 7e9caa2..55ac711 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1012,6 +1012,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) macro(_qt4_add_target_depends _QT_MODULE) get_target_property(_configs Qt4::${_QT_MODULE} IMPORTED_CONFIGURATIONS) + _qt4_add_target_depends_internal(${_QT_MODULE} INTERFACE_LINK_LIBRARIES ${ARGN}) foreach(_config ${_configs}) _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} ${ARGN}) endforeach() @@ -1116,6 +1117,10 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:QT4_NO_LINK_QTMAIN>>>) set(_isPolicyNEW $<TARGET_POLICY:CMP0020>) get_target_property(_configs Qt4::QtCore IMPORTED_CONFIGURATIONS) + set_property(TARGET Qt4::QtCore APPEND PROPERTY + INTERFACE_LINK_LIBRARIES + $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt4::qtmain> + ) foreach(_config ${_configs}) set_property(TARGET Qt4::QtCore APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} |