Merge pull request #42337 from nirvn/fix_build_no_georeferencer

Fix building QGIS when WITH_GEOREFERENCER is false
qgis · Mar 20, 2021 · 71555ab · 71555ab
2 parents d4d0d20 + 959173a
commit 71555ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -18,7 +18,10 @@ cmake -GNinja \
  -DWITH_QWTPOLAR=OFF \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
+ -DWITH_GEOREFERENCER=OFF \
+ -DWITH_ANALYSIS=ON \
  -DWITH_DESKTOP=OFF \
+ -DWITH_GUI=OFF \
  -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
  -DWITH_SERVER_PLUGINS=ON \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -678,7 +678,7 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050800)
 # For fast string concatenation
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 
-if (WITH_GEOREFERENCER)
+if (WITH_GEOREFERENCER OR WITH_ANALYSIS)
   find_package(GSL REQUIRED)
   set(HAVE_GEOREFERENCER TRUE)
 endif()