1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix separately building SQL plugins with CMake 3.16

Browse Source 
Also move the cmake_minimum_required call to the top of the file,
because the line before already requires some policy settings, which is
what cmake_minimum_required() is establishing.

For the standard Qt build, we make sure to get appropriate policy
settings by calling qt_internal_upgrade_cmake_policies().

Change-Id: If97556a9dd00646e83957959d0f9f16916625160
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit d95a1a8bd4734df3c2b6b55e5eb7a86108b682d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2021-01-13 17:21:56 +01:00 committed by Qt Cherry-pick Bot
parent 198a985c09
commit 5463f25586
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/sqldrivers/CMakeLists.txt
View File

@ -1,8 +1,8 @@
# Generated from sqldrivers.pro.
# special case begin
cmake_minimum_required(VERSION 3.16)
if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt")
cmake_minimum_required(VERSION 3.17)
include(.cmake.conf)
project(QSQLiteDriverPlugins
VERSION "${QT_REPO_MODULE_VERSION}"
@ -19,6 +19,8 @@ if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL
# needed by qt_internal_add_plugin
add_custom_target(qt_plugins)
else()
qt_internal_upgrade_cmake_policies()
endif()
# Currently handled completely manually.