diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-04-27 16:50:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-29 14:05:39 +0200 |
| commit | 6e8d306ca76afa3c4c2ea1f33a6c6459ddbffaf6 (patch) | |
| tree | 1cb9f6b0ae36eef92084535142c1434f57c24e10 /mkspecs/cmake | |
| parent | 7fc8edf069c6fd01caa75185071c941cf1f688bc (diff) | |
Make sure different modules do not overwrite each others dependencies.
Change-Id: I30ca05d3c692a707cfe829ad5fee099549bab540
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs/cmake')
| -rw-r--r-- | mkspecs/cmake/Qt5BasicConfig.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in index fa62b3e9b1..0199129ff9 100644 --- a/mkspecs/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in @@ -17,7 +17,7 @@ string(TOUPPER "$${CMAKE_MODULE_NAME}" _CMAKE_MODULE_NAME_UPPER) set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -DQT_\${_CMAKE_MODULE_NAME_UPPER}_LIB) set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS QT_\${_CMAKE_MODULE_NAME_UPPER}_LIB) -set(_Qt5_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") +set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED) if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED) @@ -28,7 +28,7 @@ if (Qt5$${CMAKE_MODULE_NAME}_FIND_QUIETLY) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() -foreach(_module_dep ${_Qt5_MODULE_DEPENDENCIES}) +foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES}) if (NOT Qt5${_module_dep}_FOUND) find_package(Qt5${_module_dep} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}) endif() |