Merge pull request #54641 from m-kuhn/cmake-proj

[cmake] Use proj cmake configuration and cleanup GDAL_INCLUDE_DIR
qgis · Sep 19, 2023 · 80c1bc7 · 80c1bc7
2 parents b14be57 + 1e1fb47
commit 80c1bc7
Show file tree

Hide file tree

Showing 22 changed files with 85 additions and 108 deletions.
diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -7,9 +7,9 @@
 # CMake module to search for Proj library
 #
 # If it's found it sets PROJ_FOUND to TRUE
-# and following variables are set:
-#    PROJ_INCLUDE_DIR
-#    PROJ_LIBRARY
+# and adds the following target
+#
+#   PROJ::proj
 
 # FIND_PATH and FIND_LIBRARY normally search standard locations
 # before the specified paths. To search non-standard paths first,
@@ -18,79 +18,89 @@
 # locations. When an earlier FIND_* succeeds, subsequent FIND_*s
 # searching for the same item do nothing.
 
-# try to use framework on mac
-# want clean framework path, not unix compatibility path
-IF (APPLE)
-  IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
-      OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
-      OR NOT CMAKE_FIND_FRAMEWORK)
-    SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
-    SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
-    #FIND_PATH(PROJ_INCLUDE_DIR PROJ/proj_api.h)
-    FIND_LIBRARY(PROJ_LIBRARY PROJ)
-    IF (PROJ_LIBRARY)
-      # FIND_PATH doesn't add "Headers" for a framework
-      SET (PROJ_INCLUDE_DIR ${PROJ_LIBRARY}/Headers CACHE PATH "Path to a file.")
-    ENDIF (PROJ_LIBRARY)
-    SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
-  ENDIF ()
-ENDIF (APPLE)
+find_package(PROJ CONFIG)
 
-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
-  "$ENV{INCLUDE}"
-  "$ENV{LIB_DIR}/include"
-  )
-IF (NOT PROJ_INCLUDE_DIR)
-  FIND_PATH(PROJ_INCLUDE_DIR proj.h
+# Fallback for systems where proj-targets.cmake is not present.
+if(NOT PROJ_FOUND)
+  # try to use framework on mac
+  # want clean framework path, not unix compatibility path
+  IF (APPLE)
+    IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
+        OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
+        OR NOT CMAKE_FIND_FRAMEWORK)
+      SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
+      SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
+      #FIND_PATH(PROJ_INCLUDE_DIR PROJ/proj_api.h)
+      FIND_LIBRARY(PROJ_LIBRARY PROJ)
+      IF (PROJ_LIBRARY)
+        # FIND_PATH doesn't add "Headers" for a framework
+        SET (PROJ_INCLUDE_DIR ${PROJ_LIBRARY}/Headers CACHE PATH "Path to a file.")
+      ENDIF (PROJ_LIBRARY)
+      SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
+    ENDIF ()
+  ENDIF (APPLE)
+
+  FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
     "$ENV{INCLUDE}"
     "$ENV{LIB_DIR}/include"
     )
-ENDIF (NOT PROJ_INCLUDE_DIR)
-
-FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
-  "$ENV{LIB}"
-  "$ENV{LIB_DIR}/lib"
-  )
-
-IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
-   SET(PROJ_FOUND TRUE)
-ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
-
-IF (PROJ_FOUND)
-   IF (EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
-     FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version)
-     STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}")
-     STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}")
-     STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}")
-     STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
-     IF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
-       MESSAGE (FATAL_ERROR "Cannot build QGIS using Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH} Use 7.2.0 or higher.")
-     ENDIF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
-   ELSE(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
-     FILE(READ ${PROJ_INCLUDE_DIR}/proj_api.h proj_version)
-     STRING(REGEX REPLACE "^.*PJ_VERSION ([0-9]+).*$" "\\1" PJ_VERSION "${proj_version}")
-
-     # This will break if 4.10.0 ever will be released (highly unlikely)
-     STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1" PROJ_VERSION_MAJOR "${PJ_VERSION}")
-     STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\2" PROJ_VERSION_MINOR "${PJ_VERSION}")
-     STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\3" PROJ_VERSION_PATCH "${PJ_VERSION}")
-     STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
-
-     # Minimum Proj version required is 4.9.3
-     IF ((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
-       MESSAGE(FATAL_ERROR "Found Proj: ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}. Cannot build QGIS using Proj older than 4.9.3.")
-     ENDIF((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
-   ENDIF(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
-   IF (NOT PROJ_FIND_QUIETLY)
-     MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} version ${PROJ_VERSION_MAJOR} ${PROJ_VERSION_STR}")
-   ENDIF (NOT PROJ_FIND_QUIETLY)
-
-   INCLUDE_DIRECTORIES(BEFORE SYSTEM ${PROJ_INCLUDE_DIR})
-
-ELSE (PROJ_FOUND)
-
-   IF (PROJ_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Proj")
-   ENDIF (PROJ_FIND_REQUIRED)
+  IF (NOT PROJ_INCLUDE_DIR)
+    FIND_PATH(PROJ_INCLUDE_DIR proj.h
+      "$ENV{INCLUDE}"
+      "$ENV{LIB_DIR}/include"
+      )
+  ENDIF (NOT PROJ_INCLUDE_DIR)
+
+  FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
+    "$ENV{LIB}"
+    "$ENV{LIB_DIR}/lib"
+    )
+
+  IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
+     SET(PROJ_FOUND TRUE)
+  ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
+
+  IF (PROJ_FOUND)
+     IF (EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
+       FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version)
+       STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}")
+       STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}")
+       STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}")
+       STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
+       IF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
+         MESSAGE (FATAL_ERROR "Cannot build QGIS using Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH} Use 7.2.0 or higher.")
+       ENDIF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
+     ELSE(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
+       FILE(READ ${PROJ_INCLUDE_DIR}/proj_api.h proj_version)
+       STRING(REGEX REPLACE "^.*PJ_VERSION ([0-9]+).*$" "\\1" PJ_VERSION "${proj_version}")
+
+       # This will break if 4.10.0 ever will be released (highly unlikely)
+       STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1" PROJ_VERSION_MAJOR "${PJ_VERSION}")
+       STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\2" PROJ_VERSION_MINOR "${PJ_VERSION}")
+       STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\3" PROJ_VERSION_PATCH "${PJ_VERSION}")
+       STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
+
+       # Minimum Proj version required is 4.9.3
+       IF ((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
+         MESSAGE(FATAL_ERROR "Found Proj: ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}. Cannot build QGIS using Proj older than 4.9.3.")
+       ENDIF((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
+     ENDIF(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
+     IF (NOT PROJ_FIND_QUIETLY)
+       MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} version ${PROJ_VERSION_MAJOR} ${PROJ_VERSION_STR}")
+     ENDIF (NOT PROJ_FIND_QUIETLY)
+
+     INCLUDE_DIRECTORIES(BEFORE SYSTEM ${PROJ_INCLUDE_DIR})
 
-ENDIF (PROJ_FOUND)
+     add_library(PROJ::proj UNKNOWN IMPORTED)
+     target_link_libraries(PROJ::proj INTERFACE ${PROJ_LIBRARY})
+     target_include_directories(PROJ::proj INTERFACE ${PROJ_INCLUDE_DIR})
+     set_target_properties(PROJ::proj PROPERTIES IMPORTED_LOCATION ${PROJ_LIBRARY})
+
+  ELSE (PROJ_FOUND)
+
+     IF (PROJ_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find Proj")
+     ENDIF (PROJ_FIND_REQUIRED)
+
+  ENDIF (PROJ_FOUND)
+endif()
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -73,7 +73,6 @@ include_directories(SYSTEM
   ${QT_QTNETWORK_INCLUDE_DIR}
   ${QT_QTSVG_INCLUDE_DIR}
   ${QT_QTXML_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${QWT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -2247,7 +2247,6 @@ target_include_directories(qgis_core SYSTEM PUBLIC
   ${${QT_VERSION_BASE}Network_INCLUDE_DIRS}
   ${${QT_VERSION_BASE}Sql_INCLUDE_DIRS}
   ${${QT_VERSION_BASE}Concurrent_INCLUDE_DIRS}
-  ${PROJ_INCLUDE_DIR}
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
   ${GEOS_INCLUDE_DIR}
@@ -2415,7 +2414,6 @@ target_link_libraries(qgis_core
   ${OPTIONAL_QTWEBKIT}
   ${QCA_LIBRARY}
   ${QTKEYCHAIN_LIBRARY}
-  ${PROJ_LIBRARY}
   ${GEOS_LIBRARY}
   GDAL::GDAL
   ${SPATIALINDEX_LIBRARY}
@@ -2425,6 +2423,7 @@ target_link_libraries(qgis_core
   ${Protobuf_LITE_LIBRARY}
   ${ZLIB_LIBRARIES}
   ${EXIV2_LIBRARY}
+  PROJ::proj
 )
 
 if (WITH_DRACO)

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

diff --git a/src/plugins/geometry_checker/CMakeLists.txt b/src/plugins/geometry_checker/CMakeLists.txt
@@ -49,10 +49,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
-include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
-)
-
 target_link_libraries(plugin_geometrychecker
   qgis_core
   qgis_gui

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -81,8 +81,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
-  ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )

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

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
-  ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )

diff --git a/src/providers/hana/CMakeLists.txt b/src/providers/hana/CMakeLists.txt
@@ -67,8 +67,6 @@ include_directories(
 )
 
 include_directories (SYSTEM
-  ${PROJ_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ${ODBC_INCLUDE_DIRS}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}

diff --git a/src/quickgui/CMakeLists.txt b/src/quickgui/CMakeLists.txt
@@ -26,8 +26,6 @@ include_directories(
 )
 
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
-  ${PROJ_INCLUDE_DIR}
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}

diff --git a/src/quickgui/plugin/CMakeLists.txt b/src/quickgui/plugin/CMakeLists.txt
@@ -28,8 +28,6 @@ include_directories(
 )
 
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
-  ${PROJ_INCLUDE_DIR}
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}

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

diff --git a/src/server/services/wcs/CMakeLists.txt b/src/server/services/wcs/CMakeLists.txt
@@ -19,7 +19,6 @@ add_library (wcs MODULE ${wcs_SRCS})
 target_compile_features(wcs PRIVATE cxx_std_17)
 
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 

diff --git a/src/server/services/wfs/CMakeLists.txt b/src/server/services/wfs/CMakeLists.txt
@@ -35,7 +35,6 @@ foreach(_library_type MODULE STATIC)
   target_compile_features(${_library_name} PRIVATE cxx_std_17)
 
   include_directories(${_library_name} SYSTEM PUBLIC
-    ${GDAL_INCLUDE_DIR}
     ${POSTGRES_INCLUDE_DIR}
   )
 

diff --git a/src/server/services/wfs3/CMakeLists.txt b/src/server/services/wfs3/CMakeLists.txt
@@ -17,7 +17,6 @@ add_library (wfs3 MODULE ${WFS3_SRCS})
 target_compile_features(wfs3 PRIVATE cxx_std_17)
 
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 

diff --git a/src/server/services/wms/CMakeLists.txt b/src/server/services/wms/CMakeLists.txt
@@ -45,7 +45,6 @@ foreach(_library_type MODULE STATIC)
   target_compile_features(${_library_name} PRIVATE cxx_std_17)
 
   include_directories(${_library_name} SYSTEM PUBLIC
-    ${GDAL_INCLUDE_DIR}
     ${POSTGRES_INCLUDE_DIR}
   )
 

diff --git a/src/server/services/wmts/CMakeLists.txt b/src/server/services/wmts/CMakeLists.txt
@@ -24,7 +24,6 @@ add_library (wmts MODULE ${WMTS_SRCS} ${WMTS_HDRS})
 target_compile_features(wmts PRIVATE cxx_std_17)
 
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 

diff --git a/tests/src/3d/CMakeLists.txt b/tests/src/3d/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 )
 include_directories(SYSTEM
   ${QT_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ${${QT_VERSION_BASE}_3DEXTRA_INCLUDE_DIR}
 )
 

diff --git a/tests/src/3d/sandbox/CMakeLists.txt b/tests/src/3d/sandbox/CMakeLists.txt
@@ -34,7 +34,6 @@ target_link_libraries(qgis_3d_sandbox
   ${QT_VERSION_BASE}::Svg
   ${QT_VERSION_BASE}::Network
   ${QT_VERSION_BASE}::Test
-  ${PROJ_LIBRARY}
   ${GEOS_LIBRARY}
   ${QWT_LIBRARY}
   qgis_core

diff --git a/tests/src/providers/grass/CMakeLists.txt b/tests/src/providers/grass/CMakeLists.txt
@@ -1,9 +1,6 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/providers/grass
 )
-include_directories(BEFORE SYSTEM
-  ${PROJ_INCLUDE_DIR}
-)
 include_directories(SYSTEM
   ${POSTGRES_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
@@ -28,7 +25,6 @@ macro (ADD_QGIS_GRASS_TEST grass_build_version testname testsrc)
     ${QT_VERSION_BASE}::Core
     ${QT_VERSION_BASE}::Svg
     ${QT_VERSION_BASE}::Test
-    ${PROJ_LIBRARY}
     ${GEOS_LIBRARY}
     qgis_core
     qgis_test

diff --git a/tests/src/quickgui/CMakeLists.txt b/tests/src/quickgui/CMakeLists.txt
@@ -16,11 +16,9 @@ include_directories(
 )
 
 include_directories(SYSTEM
-    ${PROJ_INCLUDE_DIR}
     ${GEOS_INCLUDE_DIR}
     ${LIBZIP_INCLUDE_DIRS}
     ${SPATIALINDEX_INCLUDE_DIR}
-    ${GDAL_INCLUDE_DIR}
     ${QCA_INCLUDE_DIR}
     ${QTKEYCHAIN_INCLUDE_DIR}
 )

diff --git a/tests/src/quickgui/app/CMakeLists.txt b/tests/src/quickgui/app/CMakeLists.txt
@@ -21,8 +21,6 @@ include_directories(
 )
 
 include_directories(SYSTEM
-  ${GDAL_INCLUDE_DIR}
-  ${PROJ_INCLUDE_DIR}
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}