sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62071 from m-kuhn/cmake_3_22

Browse Source 
Reduce min cmake version to 3.22
This commit is contained in:
Matthias Kuhn 2025-06-01 08:19:22 +02:00 committed by GitHub
commit 261ee7da13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
#############################################################
# CMake settings
cmake_minimum_required(VERSION 3.23.0)
cmake_minimum_required(VERSION 3.22.0)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_AUTORCC ON)
# set path to additional CMake modules

11
cmake/FindSpatiaLite.cmake
View File

@ -17,16 +17,7 @@ if(PkgConfig_FOUND)
endif()
if(PC_SPATIALITE_FOUND)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
add_library(spatialite::spatialite ALIAS PkgConfig::PC_SPATIALITE)
else()
set(SPATIALITE_INCLUDE_DIR "${PC_SPATIALITE_INCLUDE_DIRS}" CACHE STRING "")
set(SPATIALITE_LIBRARY "${PC_SPATIALITE_LIBRARIES}" CACHE STRING "")
if(NOT TARGET spatialite::spatialite)
add_library(spatialite::spatialite INTERFACE IMPORTED)
set_target_properties(spatialite::spatialite PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_SPATIALITE)
endif()
endif()
add_library(spatialite::spatialite ALIAS PkgConfig::PC_SPATIALITE)
set(SPATIALITE_FOUND TRUE)
else()
# Fallback for systems without PkgConfig, e.g. OSGeo4W

3
src/core/CMakeLists.txt
View File

@ -1044,9 +1044,6 @@ if (WITH_INTERNAL_POLY2TRI)
endif ()
file(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*")
if(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA)
string(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
endif()
string(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")
string(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}")
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp

4
src/ui/CMakeLists.txt
View File

@ -49,11 +49,7 @@ set(QGIS_GUI_UI_HDRS ${QGIS_UIS_H} PARENT_SCOPE)
add_custom_target(ui ALL DEPENDS ${QGIS_UIS_H})
# target_sources for custom targets only available in cmake 3.20 and above,
# debian bullseye still has 3.18
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20")
target_sources(ui
PRIVATE
qgsplaybackcontrollerwidgetbase.ui
)
endif(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20")