feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Enable BUILD_WITH_PCH for builds with Qt 6

Browse Source 
The issues have been fixed in the meantime

Fixes: QTCREATORBUG-25950
Change-Id: I22cf765acd3008a5b216a9e6afe5854589c7b515
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2021-07-01 13:12:17 +02:00
parent 4aaae4939a
commit b1171f83c1
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -52,20 +52,17 @@ find_package(Qt5
) )
if (Qt5_VERSION VERSION_LESS 6.0.0) if (Qt5_VERSION VERSION_LESS 6.0.0)
install(TARGETS Qt6Core5Compat EXPORT QtCreator) install(TARGETS Qt6Core5Compat EXPORT QtCreator)
set(BUILD_WITH_PCH_DEFAULT ON)
# Specify standards conformance mode to MSVC 2017 and later # Specify standards conformance mode to MSVC 2017 and later
# Qt6 has the values as part of the Qt6::Platform target interface # Qt6 has the values as part of the Qt6::Platform target interface
if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910) if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910)
add_compile_options(/permissive- /Zc:__cplusplus) add_compile_options(/permissive- /Zc:__cplusplus)
endif() endif()
else()
set(BUILD_WITH_PCH_DEFAULT OFF)
endif() endif()
find_package(Qt5 COMPONENTS LinguistTools QUIET) find_package(Qt5 COMPONENTS LinguistTools QUIET)
find_package(Qt5 COMPONENTS Designer DesignerComponents Help SerialPort Svg Tools QUIET) find_package(Qt5 COMPONENTS Designer DesignerComponents Help SerialPort Svg Tools QUIET)
option(BUILD_WITH_PCH "Build with precompiled headers" ${BUILD_WITH_PCH_DEFAULT}) option(BUILD_WITH_PCH "Build with precompiled headers" ON)
find_package(Threads) find_package(Threads)
find_package(Clang QUIET) find_package(Clang QUIET)