Skip to content
Permalink
Browse files
Remove obsolete WITH_GEOREFERENCER
  • Loading branch information
nirvn committed Jun 1, 2021
1 parent 54e8d80 commit 018efaa306b95007c7447a6006b7d229c4fd1111
Showing with 3 additions and 8 deletions.
  1. +0 −1 .ci/ogc/build.sh
  2. +1 −5 CMakeLists.txt
  3. +2 −2 src/app/CMakeLists.txt
@@ -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 \
@@ -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)
@@ -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}
)

0 comments on commit 018efaa

Please sign in to comment.