From a861e7ea14e126894e79bd959c3c0ae5e2b1d94b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 27 Aug 2012 19:56:04 +0200 Subject: Fix CMake file INSTALLS with debug_and_release configurations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iad0161969e3632862102703fcc239358387e2181 Reviewed-by: Oswald Buddenhagen Reviewed-by: Peter Kümmel Reviewed-by: Stephen Kelly --- mkspecs/features/create_cmake.prf | 6 +++--- mkspecs/features/qt_module.prf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 450a6d901e..48e00ec0c9 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -152,7 +152,7 @@ cmake_config_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_ cmake_config_version_file.input = $$PWD/../cmake/Qt5ConfigVersion.cmake.in cmake_config_version_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake -QMAKE_SUBSTITUTES += \ +!build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ cmake_config_version_file @@ -166,7 +166,7 @@ exists($$cmake_extras_file.input) { CMAKE_MODULE_EXTRAS = "true" cmake_extras_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake - QMAKE_SUBSTITUTES += cmake_extras_file + !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file cmake_qt5_module_files.files += \ $$cmake_extras_file.output @@ -179,7 +179,7 @@ exists($$cmake_macros_file.input) { 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 + !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file cmake_qt5_module_files.files += $$cmake_macros_file.output } diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 19c22c9692..b9fa75d0f5 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -129,7 +129,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF QT += $$QT_FOR_PRIVATE unset(QT_FOR_PRIVATE) -!build_pass:!internal_module:CONFIG += create_cmake +!internal_module:CONFIG += create_cmake contains(TARGET, QtAddOn.*): \ DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB -- cgit v1.2.3