From ba48e63f1e68a22dd46b6c33d283190bf8aa0aed Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 9 Feb 2013 10:20:14 +0100 Subject: [PATCH] Generate config-specific interface link libraries propeties. All other properties we generate are config-specific, so it makes sense to do so here too. --- Modules/FindQt4.cmake | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 35420b48b7..5baee01cb8 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -985,11 +985,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) endmacro() 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() 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() @@ -1067,10 +1075,14 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) set(_isWin32 $>) set(_isNotExcluded $>>) set(_isPolicyNEW $) - set_property(TARGET Qt4::QtCore APPEND PROPERTY - IMPORTED_LINK_INTERFACE_LIBRARIES - $<$:Qt4::qtmain> - ) + get_target_property(_configs Qt4::QtCore IMPORTED_CONFIGURATIONS) + foreach(_config ${_configs}) + set_property(TARGET Qt4::QtCore APPEND PROPERTY + IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} + $<$:Qt4::qtmain> + ) + endforeach() + unset(_configs) unset(_isExe) unset(_isWin32) unset(_isNotExcluded)