Only analysis lib depends on EXIV2, not core/etc

nyalldawson · nyalldawson · commit 5ed35d6dfa6d · 2018-11-13T07:13:36.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -280,7 +280,6 @@ IF(WITH_CORE)
     FIND_PACKAGE(Qwt REQUIRED)
   ENDIF (WITH_GUI)
   FIND_PACKAGE(LibZip REQUIRED)
-  FIND_PACKAGE(EXIV2 REQUIRED)
 
   FIND_PACKAGE(Sqlite3)
   IF (NOT SQLITE3_FOUND)
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -194,6 +194,8 @@ SET(QGIS_ANALYSIS_MOC_HDRS
   vector/geometry_checker/qgsgeometrymissingvertexcheck.h
 )
 
+FIND_PACKAGE(EXIV2 REQUIRED)
+
 INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(SYSTEM ${SQLITE3_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(BEFORE raster)

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,8 @@ SET(QGIS_ANALYSIS_MOC_HDRS`
`194`	`194`	`vector/geometry_checker/qgsgeometrymissingvertexcheck.h`
`195`	`195`	`)`
`196`	`196`
	`197`	`+FIND_PACKAGE(EXIV2 REQUIRED)`
	`198`	`+`
`197`	`199`	`INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})`
`198`	`200`	`INCLUDE_DIRECTORIES(SYSTEM ${SQLITE3_INCLUDE_DIR})`
`199`	`201`	`INCLUDE_DIRECTORIES(BEFORE raster)`