Overwrite the LIB_DEPENDENCIES of modules.
authorStephen Kelly <stephen.kelly@kdab.com>
Mon, 26 Mar 2012 04:41:04 +0000 (06:41 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 30 Mar 2012 23:49:26 +0000 (01:49 +0200)
This way if a module is found more than once, the list does not grow
duplicates.

Change-Id: I08e3e2a83453f45a49fe79e803a4b50d115709a3
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
mkspecs/cmake/Qt5BasicConfig.cmake.in

index 8953f69..a04d2b4 100644 (file)
@@ -35,6 +35,8 @@ if (Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
   list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
 endif()
 
+set(Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES "$${CMAKE_QT5_MODULE_DEPS}")
+
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 # For static builds, we also list the dependencies of
 # Qt so that consumers can build.
@@ -84,8 +86,6 @@ list(APPEND Qt5Gui_LIB_DEPENDENCIES ${JPEG_LIBRARIES})
 
 !!ENDIF # Static
 
-list(APPEND Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES "$${CMAKE_QT5_MODULE_DEPS}")
-
 if (NOT _Qt5$${CMAKE_MODULE_NAME}_target)
     set(_Qt5$${CMAKE_MODULE_NAME}_target 1)
 !!IF !isEmpty(CMAKE_STATIC_TYPE)