diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-06-23 16:31:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 04:18:29 +0200 |
| commit | fa6ca58b8bddcd0a3f897dca5ddededc23a9896c (patch) | |
| tree | e7356349722a0a4e1ace427a85020e7aae044225 /mkspecs/features/create_cmake.prf | |
| parent | 70c981f973f85715e96fdd35cd3be137514177b4 (diff) | |
Don't re-evaluate the lib location.
Rely on the DESTDIR variable being set correctly by qt_module_config.
Change-Id: I1a166124024722ec5a189a7402b38646179aa890
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features/create_cmake.prf')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 6fadcd43e6..ef83f564e0 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -137,10 +137,10 @@ if (build_all|CONFIG(release, debug|release)):CMAKE_RELEASE_TYPE = release INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/../cmake/Qt5BasicConfig.cmake.in -cmake_config_file.output = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake +cmake_config_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake cmake_config_version_file.input = $$PWD/../cmake/Qt5ConfigVersion.cmake.in -cmake_config_version_file.output = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake +cmake_config_version_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake QMAKE_SUBSTITUTES += \ cmake_config_file \ @@ -154,7 +154,7 @@ cmake_extras_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}ConfigExtras. exists($$cmake_extras_file.input) { CMAKE_MODULE_EXTRAS = "true" - cmake_extras_file.output = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake + cmake_extras_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake QMAKE_SUBSTITUTES += cmake_extras_file @@ -166,7 +166,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" - cmake_macros_file.output = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake + cmake_macros_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake cmake_macros_file.config = verbatim QMAKE_SUBSTITUTES += cmake_macros_file |