diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-02-11 11:45:32 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-11 13:30:31 +0100 |
| commit | 46a4a0e8c9bf7707f5e07cbc05cbe08468526a7b (patch) | |
| tree | 5bd89ccb09b324ec9199976e7e8ab0ef787140b2 /mkspecs/features | |
| parent | 7a7d82ffd9fac842fb573aad4fe28e27bc879f91 (diff) | |
Fix warnings about existing directories during cmake file creation.
Use the new QMAKE_SUBSTITUTES.config = vebatim feature.
Change-Id: I4c08bd4694c11d48434eb225fc6902e69a4cdec2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index fe1fe4c376..3ae4ddc83b 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -102,19 +102,16 @@ exists($$cmake_extras_file.input) { $$cmake_extras_file.output } -cmake_macros_file = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake -exists($$cmake_macros_file) { +cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" - cmake_qt5_module_files.files += $$cmake_macros_file - CMAKE_MACROS_FILE_SOURCE = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake - CMAKE_MACROS_FILE_DESTINATION = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME} + cmake_macros_file.output = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake + cmake_macros_file.config = verbatim - CMAKE_MACROS_FILE_SOURCE ~= s,[/\\\\],$$QMAKE_DIR_SEP, - CMAKE_MACROS_FILE_DESTINATION ~= s,[/\\\\],$$QMAKE_DIR_SEP, + QMAKE_SUBSTITUTES += cmake_macros_file - system($$QMAKE_MKDIR \"$$CMAKE_MACROS_FILE_DESTINATION\") - system($$QMAKE_COPY \"$$CMAKE_MACROS_FILE_SOURCE\" \"$$CMAKE_MACROS_FILE_DESTINATION\") + cmake_qt5_module_files.files += $$cmake_macros_file.output } cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} |