Merge pull request #54634 from m-kuhn/cmake-gdal

[cmake] Use GDAL::GDAL target and prefer GDAL cmake config files
qgis · Sep 18, 2023 · 6c0f98e · 6c0f98e
2 parents 01a999a + 01b0eff
commit 6c0f98e
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 216 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -360,7 +360,7 @@ if(WITH_CORE)
   # required
   find_package(Proj)
   find_package(GEOS)
-  find_package(GDAL)
+  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/FindGDAL.cmake b/cmake/FindGDAL.cmake
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -2248,7 +2248,6 @@ target_include_directories(qgis_core SYSTEM PUBLIC
   ${${QT_VERSION_BASE}Sql_INCLUDE_DIRS}
   ${${QT_VERSION_BASE}Concurrent_INCLUDE_DIRS}
   ${PROJ_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
   ${GEOS_INCLUDE_DIR}
@@ -2418,7 +2417,7 @@ target_link_libraries(qgis_core
   ${QTKEYCHAIN_LIBRARY}
   ${PROJ_LIBRARY}
   ${GEOS_LIBRARY}
-  ${GDAL_LIBRARY}
+  GDAL::GDAL
   ${SPATIALINDEX_LIBRARY}
   EXPAT::EXPAT
   ${SQLITE3_LIBRARY}

diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt
@@ -11,7 +11,6 @@ else ()
   target_link_libraries(crssync
     qgis_core
     ${PROJ_LIBRARY}
-    ${GDAL_LIBRARY}
   )
 
   if(MSVC AND NOT USING_NMAKE)

diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt
@@ -44,7 +44,6 @@ target_link_libraries(qgis_process
   ${QT_VERSION_BASE}::Core
   ${PROJ_LIBRARY}
   ${GEOS_LIBRARY}
-  ${GDAL_LIBRARY}
 )
 
 if (WITH_3D)

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 include_directories (SYSTEM
-  ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
@@ -128,6 +127,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
           ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_dbmibase}
           ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_dbmiclient}
           ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gproj}
+	  GDAL::GDAL
       )
     else()
       set(GRASS_TARGET_LINK_LIBRARIES${GRASS_BUILD_VERSION}
@@ -139,6 +139,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_dbmibase}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_dbmiclient}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gproj}
+	GDAL::GDAL
       )
     endif()
 
@@ -214,14 +215,14 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
       target_link_libraries(qgis.d.rast${GRASS_BUILD_VERSION}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gis}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_datetime}
-        ${GDAL_LIBRARY}
+        GDAL::GDAL
       )
     else()
       target_link_libraries(qgis.d.rast${GRASS_BUILD_VERSION}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gis}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_datetime}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_raster}
-        ${GDAL_LIBRARY}
+        GDAL::GDAL
       )
     endif()
 
@@ -234,15 +235,15 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gis}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_datetime}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gproj}
-        ${GDAL_LIBRARY}
+        GDAL::GDAL
       )
     else()
       target_link_libraries(qgis.g.info${GRASS_BUILD_VERSION}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gis}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_datetime}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gproj}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_raster}
-        ${GDAL_LIBRARY}
+        GDAL::GDAL
       )
     endif()
     if (UNIX)
@@ -261,7 +262,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
         qgisgrass${GRASS_BUILD_VERSION}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gis}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_datetime}
-        ${GDAL_LIBRARY}
+        GDAL::GDAL
         qgis_core
       )
     else()
@@ -270,7 +271,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_gis}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_datetime}
         ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_raster}
-        ${GDAL_LIBRARY}
+        GDAL::GDAL
         qgis_core
       )
     endif()
@@ -289,7 +290,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
       ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_vect}
       ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_dbmibase}
       ${GRASS_LIBRARY${GRASS_BUILD_VERSION}_dbmiclient}
-      ${GDAL_LIBRARY}
+      GDAL::GDAL
       qgis_core
     )
 

diff --git a/src/providers/mdal/CMakeLists.txt b/src/providers/mdal/CMakeLists.txt
@@ -208,11 +208,6 @@ if (HDF5_FOUND)
   target_compile_definitions(provider_mdal PRIVATE ${HDF5_DEFINITIONS})
 endif()
 
-if (GDAL_FOUND)
-  target_include_directories(provider_mdal PRIVATE ${GDAL_INCLUDE_DIR})
-  target_link_libraries(provider_mdal ${GDAL_LIBRARY} )
-endif()
-
 if (NETCDF_FOUND)
   target_include_directories(provider_mdal PRIVATE ${NETCDF_INCLUDE_DIR})
   target_link_libraries(provider_mdal ${NETCDF_LIBRARY} )

diff --git a/src/providers/pdal/CMakeLists.txt b/src/providers/pdal/CMakeLists.txt
@@ -183,13 +183,12 @@ if (PDAL_2_5_OR_HIGHER)
 
   target_include_directories(pdal_wrench PRIVATE
     ${PDAL_INCLUDE_DIR}
-    ${GDAL_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}/external
   )
 
   target_link_libraries (pdal_wrench PRIVATE
     ${PDAL_LIBRARIES}
-    ${GDAL_LIBRARY}
+    GDAL::GDAL
     Threads::Threads
   )
 

diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
@@ -80,7 +80,6 @@ else()
 
   target_link_libraries(provider_wms
     qgis_core
-    ${GDAL_LIBRARY}  # for OGR_G_CreateGeometryFromJson()
   )
 
   if (WITH_GUI)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -116,7 +116,6 @@ target_link_libraries(qgis_server
   ${PROJ_LIBRARY}
   ${FCGI_LIBRARY}
   ${POSTGRES_LIBRARY}
-  ${GDAL_LIBRARY}
   ${QCA_LIBRARY}
 )
 

diff --git a/tests/src/3d/sandbox/CMakeLists.txt b/tests/src/3d/sandbox/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 include_directories(SYSTEM
   ${QT_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ${QT5_3DEXTRA_INCLUDE_DIR}
 )
 
@@ -37,7 +36,6 @@ target_link_libraries(qgis_3d_sandbox
   ${QT_VERSION_BASE}::Test
   ${PROJ_LIBRARY}
   ${GEOS_LIBRARY}
-  ${GDAL_LIBRARY}
   ${QWT_LIBRARY}
   qgis_core
   qgis_3d

diff --git a/tests/src/providers/grass/CMakeLists.txt b/tests/src/providers/grass/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories(
 )
 include_directories(BEFORE SYSTEM
   ${PROJ_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
 )
 include_directories(SYSTEM
   ${POSTGRES_INCLUDE_DIR}
@@ -31,7 +30,6 @@ macro (ADD_QGIS_GRASS_TEST grass_build_version testname testsrc)
     ${QT_VERSION_BASE}::Test
     ${PROJ_LIBRARY}
     ${GEOS_LIBRARY}
-    ${GDAL_LIBRARY}
     qgis_core
     qgis_test
     qgisgrass${grass_build_version}