diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d4f00b0dc0..efedfa7db5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,8 +358,8 @@ if(WITH_CORE)
   endif()
 
   # required
-  find_package(Proj)
-  find_package(GEOS)
+  find_package(Proj REQUIRED)
+  find_package(GEOS REQUIRED)
   find_package(GDAL REQUIRED)
   find_package(EXPAT REQUIRED)
   find_package(Spatialindex REQUIRED)
@@ -403,10 +403,6 @@ if(WITH_CORE)
     set (HAVE_SPATIALITE TRUE)
   endif()
 
-  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)
     # following variable is used in qgsconfig.h
     set (HAVE_POSTGRESQL TRUE)
diff --git a/cmake/FindGEOS.cmake b/cmake/FindGEOS.cmake
index 254b5e34870..f5e2551949c 100644
--- a/cmake/FindGEOS.cmake
+++ b/cmake/FindGEOS.cmake
@@ -8,180 +8,188 @@
 # CMake module to search for GEOS library
 #
 # If it's found it sets GEOS_FOUND to TRUE
-# and following variables are set:
-#    GEOS_INCLUDE_DIR
-#    GEOS_LIBRARY
+# and the following target is added
 #
+#     GEOS::geos_c
 
-INCLUDE (${CMAKE_SOURCE_DIR}/cmake/MacPlistMacros.cmake)
+find_package(GEOS CONFIG)
 
-IF(WIN32)
-
-  IF (MINGW)
-    FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" /usr/local/include /usr/include c:/msys/local/include)
-    FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" /usr/local/lib /usr/lib c:/msys/local/lib)
-  ENDIF (MINGW)
-
-  IF (MSVC)
-    FIND_PATH(GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR}/include $ENV{INCLUDE})
-    FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c_i geos_c PATHS
-      "$ENV{LIB_DIR}/lib"
-      $ENV{LIB}
-      )
-  ENDIF (MSVC)
-
-ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
-
-    FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" )
-    FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" )
-
-ELSE(WIN32)
-
- IF(UNIX)
-    # 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_LIBRARY(GEOS_LIBRARY GEOS)
-        IF (GEOS_LIBRARY)
-          # they're all the same in a framework
-          SET (GEOS_INCLUDE_DIR ${GEOS_LIBRARY}/Headers CACHE PATH "Path to a file.")
-          # set GEOS_CONFIG to make later test happy, not used here, may not exist
-          SET (GEOS_CONFIG ${GEOS_LIBRARY}/unix/bin/geos-config CACHE FILEPATH "Path to a program.")
-          # version in info.plist
-          GET_VERSION_PLIST (${GEOS_LIBRARY}/Resources/Info.plist GEOS_VERSION)
-          IF (NOT GEOS_VERSION)
-            MESSAGE (FATAL_ERROR "Could not determine GEOS version from framework.")
-          ENDIF (NOT GEOS_VERSION)
+if(NOT GEOS_FOUND)
+  INCLUDE (${CMAKE_SOURCE_DIR}/cmake/MacPlistMacros.cmake)
+  
+  IF(WIN32)
+  
+    IF (MINGW)
+      FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" /usr/local/include /usr/include c:/msys/local/include)
+      FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" /usr/local/lib /usr/lib c:/msys/local/lib)
+    ENDIF (MINGW)
+  
+    IF (MSVC)
+      FIND_PATH(GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR}/include $ENV{INCLUDE})
+      FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c_i geos_c PATHS
+        "$ENV{LIB_DIR}/lib"
+        $ENV{LIB}
+        )
+    ENDIF (MSVC)
+  
+  ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
+  
+      FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" )
+      FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" )
+  
+  ELSE(WIN32)
+  
+   IF(UNIX)
+      # 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_LIBRARY(GEOS_LIBRARY GEOS)
+          IF (GEOS_LIBRARY)
+            # they're all the same in a framework
+            SET (GEOS_INCLUDE_DIR ${GEOS_LIBRARY}/Headers CACHE PATH "Path to a file.")
+            # set GEOS_CONFIG to make later test happy, not used here, may not exist
+            SET (GEOS_CONFIG ${GEOS_LIBRARY}/unix/bin/geos-config CACHE FILEPATH "Path to a program.")
+            # version in info.plist
+            GET_VERSION_PLIST (${GEOS_LIBRARY}/Resources/Info.plist GEOS_VERSION)
+            IF (NOT GEOS_VERSION)
+              MESSAGE (FATAL_ERROR "Could not determine GEOS version from framework.")
+            ENDIF (NOT GEOS_VERSION)
+            STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
+            STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")
+            IF (GEOS_VERSION_MAJOR LESS 3)
+              MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.0.0 or higher.")
+            ENDIF (GEOS_VERSION_MAJOR LESS 3)
+          ENDIF (GEOS_LIBRARY)
+          SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
+        ENDIF ()
+      ENDIF (APPLE)
+  
+      IF(CYGWIN)
+        FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS /usr/lib /usr/local/lib)
+      ENDIF(CYGWIN)
+  
+      IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
+        # didn't find OS X framework, and was not set by user
+        SET(GEOS_CONFIG_PREFER_PATH "$ENV{GEOS_HOME}/bin" CACHE STRING "preferred path to GEOS (geos-config)")
+        FIND_PROGRAM(GEOS_CONFIG geos-config
+            ${GEOS_CONFIG_PREFER_PATH}
+            $ENV{LIB_DIR}/bin
+            /usr/local/bin/
+            /usr/bin/
+            )
+        #MESSAGE("DBG GEOS_CONFIG ${GEOS_CONFIG}")
+  
+        IF (GEOS_CONFIG)
+  
+          EXEC_PROGRAM(${GEOS_CONFIG}
+              ARGS --version
+              OUTPUT_VARIABLE GEOS_VERSION)
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
           STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")
-          IF (GEOS_VERSION_MAJOR LESS 3)
-            MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.0.0 or higher.")
-          ENDIF (GEOS_VERSION_MAJOR LESS 3)
-        ENDIF (GEOS_LIBRARY)
-        SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
-      ENDIF ()
-    ENDIF (APPLE)
+  
+          IF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 9) )
+            MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.9.0 or higher.")
+          ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 9) )
+  
+          # set INCLUDE_DIR to prefix+include
+          EXEC_PROGRAM(${GEOS_CONFIG}
+              ARGS --prefix
+              OUTPUT_VARIABLE GEOS_PREFIX)
+  
+          FIND_PATH(GEOS_INCLUDE_DIR
+              geos_c.h
+              ${GEOS_PREFIX}/include
+              /usr/local/include
+              /usr/include
+              )
+  
+          ## extract link dirs for rpath
+          EXEC_PROGRAM(${GEOS_CONFIG}
+              ARGS --libs
+              OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
+  
+          ## split off the link dirs (for rpath)
+          ## use regular expression to match wildcard equivalent "-L*<endchar>"
+          ## with <endchar> is a space or a semicolon
+          STRING(REGEX MATCHALL "[-][L]([^ ;])+"
+              GEOS_LINK_DIRECTORIES_WITH_PREFIX
+              "${GEOS_CONFIG_LIBS}" )
+          #MESSAGE("DBG  GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")
+  
+          ## remove prefix -L because we need the pure directory for LINK_DIRECTORIES
+  
+          IF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
+            STRING(REGEX REPLACE "[-][L]" "" GEOS_LINK_DIRECTORIES ${GEOS_LINK_DIRECTORIES_WITH_PREFIX} )
+          ENDIF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
+  
+          ### XXX - mloskot: geos-config --libs does not return -lgeos_c, so set it manually
+          ## split off the name
+          ## use regular expression to match wildcard equivalent "-l*<endchar>"
+          ## with <endchar> is a space or a semicolon
+          #STRING(REGEX MATCHALL "[-][l]([^ ;])+"
+          #  GEOS_LIB_NAME_WITH_PREFIX
+          #  "${GEOS_CONFIG_LIBS}" )
+          #MESSAGE("DBG  GEOS_CONFIG_LIBS=${GEOS_CONFIG_LIBS}")
+          #MESSAGE("DBG  GEOS_LIB_NAME_WITH_PREFIX=${GEOS_LIB_NAME_WITH_PREFIX}")
+          SET(GEOS_LIB_NAME_WITH_PREFIX -lgeos_c CACHE STRING INTERNAL)
+  
+          ## remove prefix -l because we need the pure name
+  
+          IF (GEOS_LIB_NAME_WITH_PREFIX)
+            STRING(REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
+          ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
+          #MESSAGE("DBG  GEOS_LIB_NAME=${GEOS_LIB_NAME}")
+  
+          IF (APPLE)
+            IF (NOT GEOS_LIBRARY)
+              # work around empty GEOS_LIBRARY left by framework check
+              # while still preserving user setting if given
+              # ***FIXME*** need to improve framework check so below not needed
+              SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
+            ENDIF (NOT GEOS_LIBRARY)
+          ELSE (APPLE)
+            FIND_LIBRARY(GEOS_LIBRARY NAMES ${GEOS_LIB_NAME} PATHS ${GEOS_LIB_DIRECTORIES}/lib)
+          ENDIF (APPLE)
+          #MESSAGE("DBG  GEOS_LIBRARY=${GEOS_LIBRARY}")
+  
+        ELSE(GEOS_CONFIG)
+          MESSAGE("FindGEOS.cmake: geos-config not found. Please set it manually. GEOS_CONFIG=${GEOS_CONFIG}")
+        ENDIF(GEOS_CONFIG)
+      ENDIF(NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
+    ENDIF(UNIX)
+  ENDIF(WIN32)
+  
+  IF(GEOS_INCLUDE_DIR AND NOT GEOS_VERSION)
+    FILE(READ ${GEOS_INCLUDE_DIR}/geos_c.h VERSIONFILE)
+    STRING(REGEX MATCH "#define GEOS_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" GEOS_VERSION ${VERSIONFILE})
+    STRING(REGEX MATCH "[0-9]+\\.[0-9]\\.[0-9]+" GEOS_VERSION ${GEOS_VERSION})
+  ENDIF(GEOS_INCLUDE_DIR AND NOT GEOS_VERSION)
+  
+  IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
+     SET(GEOS_FOUND TRUE)
+  ENDIF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
+  
+  IF (GEOS_FOUND)
+  
+     add_library(GEOS::geos_c UNKNOWN IMPORTED)
+     target_link_libraries(GEOS::geos_c INTERFACE ${GEOS_LIBRARY})
+     target_include_directories(GEOS::geos_c INTERFACE ${GEOS_INCLUDE_DIR})
+     set_target_properties(GEOS::geos_c PROPERTIES IMPORTED_LOCATION ${GEOS_LIBRARY})
 
-    IF(CYGWIN)
-      FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS /usr/lib /usr/local/lib)
-    ENDIF(CYGWIN)
-
-    IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
-      # didn't find OS X framework, and was not set by user
-      SET(GEOS_CONFIG_PREFER_PATH "$ENV{GEOS_HOME}/bin" CACHE STRING "preferred path to GEOS (geos-config)")
-      FIND_PROGRAM(GEOS_CONFIG geos-config
-          ${GEOS_CONFIG_PREFER_PATH}
-          $ENV{LIB_DIR}/bin
-          /usr/local/bin/
-          /usr/bin/
-          )
-      #MESSAGE("DBG GEOS_CONFIG ${GEOS_CONFIG}")
-
-      IF (GEOS_CONFIG)
-
-        EXEC_PROGRAM(${GEOS_CONFIG}
-            ARGS --version
-            OUTPUT_VARIABLE GEOS_VERSION)
-        STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
-        STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")
-
-        IF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 9) )
-          MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.9.0 or higher.")
-        ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 9) )
-
-        # set INCLUDE_DIR to prefix+include
-        EXEC_PROGRAM(${GEOS_CONFIG}
-            ARGS --prefix
-            OUTPUT_VARIABLE GEOS_PREFIX)
-
-        FIND_PATH(GEOS_INCLUDE_DIR
-            geos_c.h
-            ${GEOS_PREFIX}/include
-            /usr/local/include
-            /usr/include
-            )
-
-        ## extract link dirs for rpath
-        EXEC_PROGRAM(${GEOS_CONFIG}
-            ARGS --libs
-            OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
-
-        ## split off the link dirs (for rpath)
-        ## use regular expression to match wildcard equivalent "-L*<endchar>"
-        ## with <endchar> is a space or a semicolon
-        STRING(REGEX MATCHALL "[-][L]([^ ;])+"
-            GEOS_LINK_DIRECTORIES_WITH_PREFIX
-            "${GEOS_CONFIG_LIBS}" )
-        #MESSAGE("DBG  GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")
-
-        ## remove prefix -L because we need the pure directory for LINK_DIRECTORIES
-
-        IF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
-          STRING(REGEX REPLACE "[-][L]" "" GEOS_LINK_DIRECTORIES ${GEOS_LINK_DIRECTORIES_WITH_PREFIX} )
-        ENDIF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
-
-        ### XXX - mloskot: geos-config --libs does not return -lgeos_c, so set it manually
-        ## split off the name
-        ## use regular expression to match wildcard equivalent "-l*<endchar>"
-        ## with <endchar> is a space or a semicolon
-        #STRING(REGEX MATCHALL "[-][l]([^ ;])+"
-        #  GEOS_LIB_NAME_WITH_PREFIX
-        #  "${GEOS_CONFIG_LIBS}" )
-        #MESSAGE("DBG  GEOS_CONFIG_LIBS=${GEOS_CONFIG_LIBS}")
-        #MESSAGE("DBG  GEOS_LIB_NAME_WITH_PREFIX=${GEOS_LIB_NAME_WITH_PREFIX}")
-        SET(GEOS_LIB_NAME_WITH_PREFIX -lgeos_c CACHE STRING INTERNAL)
-
-        ## remove prefix -l because we need the pure name
-
-        IF (GEOS_LIB_NAME_WITH_PREFIX)
-          STRING(REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
-        ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
-        #MESSAGE("DBG  GEOS_LIB_NAME=${GEOS_LIB_NAME}")
-
-        IF (APPLE)
-          IF (NOT GEOS_LIBRARY)
-            # work around empty GEOS_LIBRARY left by framework check
-            # while still preserving user setting if given
-            # ***FIXME*** need to improve framework check so below not needed
-            SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
-          ENDIF (NOT GEOS_LIBRARY)
-        ELSE (APPLE)
-          FIND_LIBRARY(GEOS_LIBRARY NAMES ${GEOS_LIB_NAME} PATHS ${GEOS_LIB_DIRECTORIES}/lib)
-        ENDIF (APPLE)
-        #MESSAGE("DBG  GEOS_LIBRARY=${GEOS_LIBRARY}")
-
-      ELSE(GEOS_CONFIG)
-        MESSAGE("FindGEOS.cmake: geos-config not found. Please set it manually. GEOS_CONFIG=${GEOS_CONFIG}")
-      ENDIF(GEOS_CONFIG)
-    ENDIF(NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
-  ENDIF(UNIX)
-ENDIF(WIN32)
-
-IF(GEOS_INCLUDE_DIR AND NOT GEOS_VERSION)
-  FILE(READ ${GEOS_INCLUDE_DIR}/geos_c.h VERSIONFILE)
-  STRING(REGEX MATCH "#define GEOS_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" GEOS_VERSION ${VERSIONFILE})
-  STRING(REGEX MATCH "[0-9]+\\.[0-9]\\.[0-9]+" GEOS_VERSION ${GEOS_VERSION})
-ENDIF(GEOS_INCLUDE_DIR AND NOT GEOS_VERSION)
-
-IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
-   SET(GEOS_FOUND TRUE)
-ENDIF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
-
-IF (GEOS_FOUND)
-
-   IF (NOT GEOS_FIND_QUIETLY)
-      MESSAGE(STATUS "Found GEOS: ${GEOS_LIBRARY} (${GEOS_VERSION})")
-   ENDIF (NOT GEOS_FIND_QUIETLY)
-
-ELSE (GEOS_FOUND)
-
-   MESSAGE(GEOS_INCLUDE_DIR=${GEOS_INCLUDE_DIR})
-   MESSAGE(GEOS_LIBRARY=${GEOS_LIBRARY})
-   MESSAGE(FATAL_ERROR "Could not find GEOS")
-
-ENDIF (GEOS_FOUND)
+     IF (NOT GEOS_FIND_QUIETLY)
+        MESSAGE(STATUS "Found GEOS: ${GEOS_LIBRARY} (${GEOS_VERSION})")
+     ENDIF (NOT GEOS_FIND_QUIETLY)
+  
+  ELSE (GEOS_FOUND)
+  
+     MESSAGE(GEOS_INCLUDE_DIR=${GEOS_INCLUDE_DIR})
+     MESSAGE(GEOS_LIBRARY=${GEOS_LIBRARY})
+     MESSAGE(FATAL_ERROR "Could not find GEOS")
+  
+  ENDIF (GEOS_FOUND)
+endif()
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 9e3d0106b3e..443daec6824 100644
--- 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}
-  ${GEOS_INCLUDE_DIR}
   ${QWT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b76cc6ac471..869428249e9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -2249,7 +2249,6 @@ target_include_directories(qgis_core SYSTEM PUBLIC
   ${${QT_VERSION_BASE}Concurrent_INCLUDE_DIRS}
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
-  ${GEOS_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
@@ -2414,7 +2413,7 @@ target_link_libraries(qgis_core
   ${OPTIONAL_QTWEBKIT}
   ${QCA_LIBRARY}
   ${QTKEYCHAIN_LIBRARY}
-  ${GEOS_LIBRARY}
+  GEOS::geos_c
   GDAL::GDAL
   ${SPATIALINDEX_LIBRARY}
   EXPAT::EXPAT
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
index 75df156f5f0..8bfcccd01f7 100644
--- a/src/plugins/grass/CMakeLists.txt
+++ b/src/plugins/grass/CMakeLists.txt
@@ -81,7 +81,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 include_directories(SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 
diff --git a/src/plugins/topology/CMakeLists.txt b/src/plugins/topology/CMakeLists.txt
index 3a2b08d0084..30252940bd4 100644
--- a/src/plugins/topology/CMakeLists.txt
+++ b/src/plugins/topology/CMakeLists.txt
@@ -32,10 +32,6 @@ add_library (plugin_topology MODULE ${topol_SRCS} ${topol_RCCS} ${topol_UIS_H})
 # require c++17
 target_compile_features(plugin_topology PRIVATE cxx_std_17)
 
-include_directories(SYSTEM
-  ${GEOS_INCLUDE_DIR}
-)
-
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/plugins
 
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
index b057be641c2..943a95958cf 100644
--- 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
-  ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 
diff --git a/src/providers/oracle/CMakeLists.txt b/src/providers/oracle/CMakeLists.txt
index 2019bc4d6c9..dd1a552025b 100644
--- a/src/providers/oracle/CMakeLists.txt
+++ b/src/providers/oracle/CMakeLists.txt
@@ -39,7 +39,6 @@ include_directories(
   ${CMAKE_BINARY_DIR}/src/ui
 )
 include_directories(SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${QT_QTSQL_INCLUDEDIR}
 )
 
diff --git a/src/quickgui/CMakeLists.txt b/src/quickgui/CMakeLists.txt
index 4d5c659a57b..293e5fd139d 100644
--- a/src/quickgui/CMakeLists.txt
+++ b/src/quickgui/CMakeLists.txt
@@ -28,7 +28,6 @@ include_directories(
 include_directories(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
diff --git a/src/quickgui/plugin/CMakeLists.txt b/src/quickgui/plugin/CMakeLists.txt
index 4a62b4f6249..0060aca22ff 100644
--- a/src/quickgui/plugin/CMakeLists.txt
+++ b/src/quickgui/plugin/CMakeLists.txt
@@ -30,7 +30,6 @@ include_directories(
 include_directories(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
diff --git a/tests/src/providers/grass/CMakeLists.txt b/tests/src/providers/grass/CMakeLists.txt
index 9d6d833f7f3..95110d5daea 100644
--- a/tests/src/providers/grass/CMakeLists.txt
+++ b/tests/src/providers/grass/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories(
 )
 include_directories(SYSTEM
   ${POSTGRES_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 
@@ -25,7 +24,6 @@ macro (ADD_QGIS_GRASS_TEST grass_build_version testname testsrc)
     ${QT_VERSION_BASE}::Core
     ${QT_VERSION_BASE}::Svg
     ${QT_VERSION_BASE}::Test
-    ${GEOS_LIBRARY}
     qgis_core
     qgis_test
     qgisgrass${grass_build_version}
diff --git a/tests/src/quickgui/CMakeLists.txt b/tests/src/quickgui/CMakeLists.txt
index d6250e875ba..5b7a2cb651c 100644
--- a/tests/src/quickgui/CMakeLists.txt
+++ b/tests/src/quickgui/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
 )
 
 include_directories(SYSTEM
-    ${GEOS_INCLUDE_DIR}
     ${LIBZIP_INCLUDE_DIRS}
     ${SPATIALINDEX_INCLUDE_DIR}
     ${QCA_INCLUDE_DIR}
diff --git a/tests/src/quickgui/app/CMakeLists.txt b/tests/src/quickgui/app/CMakeLists.txt
index 4fb7b4c389c..d61939d5a48 100644
--- a/tests/src/quickgui/app/CMakeLists.txt
+++ b/tests/src/quickgui/app/CMakeLists.txt
@@ -23,7 +23,6 @@ include_directories(
 include_directories(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
 )