Merge pull request #927 from garlac/master

Updated exiv2 dependency to v27

SuperBuild/cmake/External-Exiv2.cmake

@@ -6,7 +6,7 @@ ExternalProject_Add(${_proj_name}
   TMP_DIR           ${_SB_BINARY_DIR}/tmp
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}/${_proj_name}
-  URL               http://www.exiv2.org/builds/exiv2-0.26-trunk.tar.gz
+  URL               http://www.exiv2.org/builds/exiv2-0.27.0-Source.tar.gz
   SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
   CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=${SB_INSTALL_DIR}
@@ -17,4 +17,4 @@ ExternalProject_Add(${_proj_name}
   LOG_DOWNLOAD      OFF
   LOG_CONFIGURE     OFF
   LOG_BUILD         OFF
-)
+)

modules/odm_extract_utm/CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8)
 set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
 
 find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
-find_library(EXIV2_LIBRARY "libexiv2.so.26" PATHS "${PROJECT_SOURCE_DIR}/../../SuperBuild/install/lib")
+find_library(EXIV2_LIBRARY "libexiv2.so.27" PATHS "${PROJECT_SOURCE_DIR}/../../SuperBuild/install/lib")
 include_directories("${PROJECT_SOURCE_DIR}/../../SuperBuild/install/include")
 
 # Add compiler options.