Merge branch 'master' into cmake-proj

qgis · Sep 18, 2023 · f278268 · f278268
2 parents 789e92b + 6c0f98e
commit f278268
Show file tree

Hide file tree

Showing 19 changed files with 210 additions and 283 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -360,8 +360,8 @@ if(WITH_CORE)
   # required
   find_package(Proj)
   find_package(GEOS)
-  find_package(GDAL)
-  find_package(Expat REQUIRED)
+  find_package(GDAL REQUIRED)
+  find_package(EXPAT REQUIRED)
   find_package(Spatialindex REQUIRED)
   find_package(LibZip REQUIRED)
 
@@ -403,8 +403,8 @@ if(WITH_CORE)
     set (HAVE_SPATIALITE TRUE)
   endif()
 
-  if (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
-    message (SEND_ERROR "Some dependencies were not found! Proj: ${PROJ_FOUND}, Geos: ${GEOS_FOUND}, GDAL: ${GDAL_FOUND}")
+  if (NOT PROJ_FOUND OR NOT GEOS_FOUND)
+    message (SEND_ERROR "Some dependencies were not found! Proj: ${PROJ_FOUND}, Geos: ${GEOS_FOUND}")
   endif()
 
   if (POSTGRES_FOUND)

diff --git a/cmake/FindExpat.cmake b/cmake/FindExpat.cmake