AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CMake file INSTALLS with debug_and_release configurations.

Browse Source 
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>
This commit is contained in:
Stephen Kelly 2012-08-27 19:56:04 +02:00 committed by Qt by Nokia
parent a912b14c75
commit a861e7ea14
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/create_cmake.prf
View File

@ -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.input = $$PWD/../cmake/Qt5ConfigVersion.cmake.in
cmake_config_version_file.output = $$DESTDIR/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 += \ !build_pass:QMAKE_SUBSTITUTES += \
cmake_config_file \ cmake_config_file \
cmake_config_version_file cmake_config_version_file
@ -166,7 +166,7 @@ exists($$cmake_extras_file.input) {
CMAKE_MODULE_EXTRAS = "true" CMAKE_MODULE_EXTRAS = "true"
cmake_extras_file.output = $$DESTDIR/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 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
cmake_qt5_module_files.files += \ cmake_qt5_module_files.files += \
$$cmake_extras_file.output $$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.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
cmake_macros_file.CONFIG = verbatim 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 cmake_qt5_module_files.files += $$cmake_macros_file.output
} }

2
mkspecs/features/qt_module.prf
View File

@ -129,7 +129,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
QT += $$QT_FOR_PRIVATE QT += $$QT_FOR_PRIVATE
unset(QT_FOR_PRIVATE) unset(QT_FOR_PRIVATE)
!build_pass:!internal_module:CONFIG += create_cmake !internal_module:CONFIG += create_cmake
contains(TARGET, QtAddOn.*): \ contains(TARGET, QtAddOn.*): \
DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB