From 25f903bf28216d62b32411c37ba5f60da07aa10a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 7 Dec 2012 10:13:24 +0100 Subject: [PATCH] Topologically sort $${MODULE}.depends when generating cmake files. The contents of this eventually go into a CMake target property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect sorted input. Usually the contents is generated by CMake itself, so generating content it expects is reasonable. This fixes the qtactiveqt cmake unit test with MingW on linux. Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b Reviewed-by: Oswald Buddenhagen --- mkspecs/features/create_cmake.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 9548c5e0ff..3aec63acf5 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -17,7 +17,7 @@ defineReplace(cmakeModuleList) { CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE}) -CMAKE_MODULE_DEPS = $$cmakeModuleList($$eval(QT.$${MODULE}.depends)) +CMAKE_MODULE_DEPS = $$cmakeModuleList($$sort_depends(QT.$${MODULE}.depends, QT.)) CMAKE_PARTIAL_MODULE_DEPS = $$replace(CMAKE_MODULE_DEPS, ";", ";Qt5::") !isEmpty(CMAKE_PARTIAL_MODULE_DEPS):CMAKE_QT5_MODULE_DEPS = "Qt5::$${CMAKE_PARTIAL_MODULE_DEPS}"