diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh index 429c7db8a85..802fe5078a6 100755 --- a/.ci/ogc/build.sh +++ b/.ci/ogc/build.sh @@ -18,7 +18,6 @@ cmake -GNinja \ -DWITH_QWTPOLAR=OFF \ -DWITH_APIDOC=OFF \ -DWITH_ASTYLE=OFF \ - -DWITH_GEOREFERENCER=OFF \ -DWITH_ANALYSIS=ON \ -DWITH_DESKTOP=OFF \ -DWITH_GUI=OFF \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 71d69e21621..e1bcc6f2f3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,8 +279,6 @@ if(WITH_CORE) endif() set (WITH_QTMOBILITY ${DEFAULT_WITH_QTMOBILITY} CACHE BOOL "Determines if QtMobility related code should be build (for example internal GPS)") - set (WITH_GEOREFERENCER TRUE CACHE BOOL "Determines whether GeoReferencer plugin should be built") - set (WITH_THREAD_LOCAL TRUE CACHE BOOL "Determines whether std::thread_local should be used") mark_as_advanced(WITH_THREAD_LOCAL) @@ -710,9 +708,7 @@ set(WITH_GSL TRUE CACHE BOOL "Determines whether GSL library should be used") if (WITH_ANALYSIS AND WITH_GSL) find_package(GSL REQUIRED) set(HAVE_GSL TRUE) - if (WITH_GEOREFERENCER) - set(HAVE_GEOREFERENCER TRUE) - endif() + set(HAVE_GEOREFERENCER TRUE) endif() if(ENABLE_COVERAGE) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index a00b68b94cd..cb9b36b952a 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -252,7 +252,7 @@ if (WITH_SPATIALITE) ) endif() -if (WITH_GEOREFERENCER) +if (HAVE_GEOREFERENCER) set(QGIS_APP_SRCS ${QGIS_APP_SRCS} georeferencer/qgsgcpcanvasitem.cpp @@ -547,7 +547,7 @@ if (WITH_3D) target_link_libraries(qgis_app qgis_3d) endif() -if (WITH_GEOREFERENCER) +if (HAVE_GEOREFERENCER) include_directories(SYSTEM ${GSL_INCLUDE_DIR} )