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

Generate config-specific interface link libraries propeties. 

All other properties we generate are config-specific, so it makes
sense to do so here too.
This commit is contained in:
Stephen Kelly 2013-02-09 10:20:14 +01:00
parent deb51a7113
commit ba48e63f1e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/FindQt4.cmake
View File

@ -985,11 +985,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endmacro() endmacro()
macro(_qt4_add_target_depends _QT_MODULE) macro(_qt4_add_target_depends _QT_MODULE)
_qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES ${ARGN}) get_target_property(_configs Qt4::${_QT_MODULE} IMPORTED_CONFIGURATIONS)
foreach(_config ${_configs})
_qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} ${ARGN})
endforeach()
set(_configs)
endmacro() endmacro()
macro(_qt4_add_target_private_depends _QT_MODULE) macro(_qt4_add_target_private_depends _QT_MODULE)
_qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_DEPENDENT_LIBRARIES ${ARGN}) get_target_property(_configs ${_QT_MODULE} IMPORTED_CONFIGURATIONS)
foreach(_config ${_configs})
_qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_DEPENDENT_LIBRARIES_${_config} ${ARGN})
endforeach()
set(_configs)
endmacro() endmacro()
@ -1067,10 +1075,14 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>) set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:QT4_NO_LINK_QTMAIN>>>) set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:QT4_NO_LINK_QTMAIN>>>)
set(_isPolicyNEW $<TARGET_POLICY:CMP0020>) set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
set_property(TARGET Qt4::QtCore APPEND PROPERTY get_target_property(_configs Qt4::QtCore IMPORTED_CONFIGURATIONS)
IMPORTED_LINK_INTERFACE_LIBRARIES foreach(_config ${_configs})
$<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt4::qtmain> set_property(TARGET Qt4::QtCore APPEND PROPERTY
) IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}
$<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt4::qtmain>
)
endforeach()
unset(_configs)
unset(_isExe) unset(_isExe)
unset(_isWin32) unset(_isWin32)
unset(_isNotExcluded) unset(_isNotExcluded)