summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-08-27 19:56:04 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-28 18:30:57 +0200
commita861e7ea14e126894e79bd959c3c0ae5e2b1d94b (patch)
tree8218acf110b017fcc91a6ee04aa400ccbd8400c7 /mkspecs
parenta912b14c755137ed5529854027b9ab3f7e06c5e9 (diff)
Fix CMake file INSTALLS with debug_and_release configurations.
Change-Id: Iad0161969e3632862102703fcc239358387e2181 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Peter K├╝mmel <syntheticpp@gmx.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/create_cmake.prf6
-rw-r--r--mkspecs/features/qt_module.prf2
2 files changed, 4 insertions, 4 deletions
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