Christoph Feck schrieb:
> Hi,
> 
Can you please check the attached patch?

@Alex:
The patch is just an educated guess, e.g. I don't know if this could
break for other targets like KDE (since they might be imported in a
different manner than Qt?). If not please commit it.


regards,
Patrick

Index: HandleImportedTargetsInCMakeRequiredLibraries.cmake
===================================================================
--- HandleImportedTargetsInCMakeRequiredLibraries.cmake	(revision 1072679)
+++ HandleImportedTargetsInCMakeRequiredLibraries.cmake	(working copy)
@@ -44,14 +44,20 @@
             ENDIF ("${_CCSR_LOOP_COUNTER}" LESS 100)
 
             LIST(GET _importedConfigs 0 _firstImportedConfig)
-            GET_TARGET_PROPERTY(_firstImportedLocation ${_CURRENT_LIB} LOCATION_${_firstImportedConfig})
+            IF(NOT WIN32)
+               GET_TARGET_PROPERTY(_firstImportedLocation ${_CURRENT_LIB} IMPORTED_LOCATION_${_firstImportedConfig})
+            ELSE(NOT WIN32)
+               GET_TARGET_PROPERTY(_firstImportedLocation ${_CURRENT_LIB} IMPORTED_IMPLIB_${_firstImportedConfig})
+            ENDIF(NOT WIN32)
             GET_TARGET_PROPERTY(_linkInterfaceLibs ${_CURRENT_LIB} IMPORTED_LINK_INTERFACE_LIBRARIES_${_firstImportedConfig} )
 
             LIST(APPEND _CCSR_NEW_REQ_LIBS  ${_firstImportedLocation})
 #                MESSAGE(STATUS "Appending lib ${_CURRENT_LIB} as ${_firstImportedLocation}")
             FOREACH(_currentLinkInterfaceLib ${_linkInterfaceLibs})
 #                   MESSAGE(STATUS "Appending link interface lib ${_currentLinkInterfaceLib}")
-               LIST(APPEND _CCSR_NEW_REQ_LIBS ${_currentLinkInterfaceLib} )
+               IF(_currentLinkInterfaceLib)
+                  LIST(APPEND _CCSR_NEW_REQ_LIBS ${_currentLinkInterfaceLib} )
+               ENDIF(_currentLinkInterfaceLib) 
             ENDFOREACH(_currentLinkInterfaceLib ${_linkInterfaceLibs})
          ELSE(_importedConfigs)
             # "Normal" libraries are just used as they are.

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Reply via email to