Add option to select building Georeferencer plugin

cjmayo · m-kuhn · commit d50930c63827 · 2017-03-04T17:23:32.000+01:00
If selected require GSL to be installed
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,7 @@ matrix:
             - libpq-dev
             - libfcgi-dev
             - libfftw3-3
+            - libgsl0-dev
             - pkg-config
             - poppler-utils
             - txt2tags
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,6 +116,8 @@ ELSE (ANDROID)
 ENDIF (ANDROID)
 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_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
 IF (WITH_GLOBE)
   SET(QT_USE_QTOPENGL 1)
diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -118,7 +118,7 @@ ELSE(WIN32)
         )
       
       ELSE(GSL_CONFIG)
-        MESSAGE("FindGSL.cmake: gsl-config not found. Please set it manually. GSL_CONFIG=${GSL_CONFIG}")
+        MESSAGE(FATAL_ERROR "FindGSL.cmake: gsl-config not found. Please install the libgsl development libraries or set the path with -DGSL_CONFIG=/path/to/gsl-config.")
       ENDIF(GSL_CONFIG)
     ENDIF (NOT GSL_INCLUDE_DIR OR NOT GSL_LIBRARIES OR NOT GSL_CONFIG)
   ENDIF(UNIX)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -9,7 +9,6 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDI
 ADD_SUBDIRECTORY(coordinate_capture)
 ADD_SUBDIRECTORY(evis)
 ADD_SUBDIRECTORY(spatialquery)
-ADD_SUBDIRECTORY(georeferencer)
 ADD_SUBDIRECTORY(gps_importer)
 ADD_SUBDIRECTORY(topology)
 ADD_SUBDIRECTORY(offline_editing)
@@ -19,6 +18,10 @@ IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)
 
+IF (WITH_GEOREFERENCER)
+  ADD_SUBDIRECTORY(georeferencer)
+ENDIF (WITH_GEOREFERENCER)
+
 IF (WITH_GLOBE)
   ADD_SUBDIRECTORY(globe)
 ENDIF (WITH_GLOBE)
diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
@@ -1,6 +1,4 @@
-FIND_PACKAGE(GSL)      # Georeferencer
-
-IF(GSL_FOUND)
+FIND_PACKAGE(GSL REQUIRED)      # Georeferencer
 
 ########################################################
 # Files
@@ -106,5 +104,3 @@ TARGET_LINK_LIBRARIES(georefplugin
 INSTALL(TARGETS georefplugin
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
   LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
-
-ENDIF(GSL_FOUND)

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ ELSE(WIN32)`
`118`	`118`	`)`
`119`	`119`
`120`	`120`	`ELSE(GSL_CONFIG)`
`121`		`- MESSAGE("FindGSL.cmake: gsl-config not found. Please set it manually. GSL_CONFIG=${GSL_CONFIG}")`
	`121`	`+ MESSAGE(FATAL_ERROR "FindGSL.cmake: gsl-config not found. Please install the libgsl development libraries or set the path with -DGSL_CONFIG=/path/to/gsl-config.")`
`122`	`122`	`ENDIF(GSL_CONFIG)`
`123`	`123`	`ENDIF (NOT GSL_INCLUDE_DIR OR NOT GSL_LIBRARIES OR NOT GSL_CONFIG)`
`124`	`124`	`ENDIF(UNIX)`