From 1ec9ff87db0faaf3a28a3e37d1282194f4b25488 Mon Sep 17 00:00:00 2001 From: garlac <40228026+garlac@users.noreply.github.com> Date: Sun, 23 Dec 2018 22:27:25 +0530 Subject: [PATCH 1/2] Update External-Exiv2.cmake Former-commit-id: 1608f021ac63770cb01a37e06effb5430da172ce --- SuperBuild/cmake/External-Exiv2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/cmake/External-Exiv2.cmake b/SuperBuild/cmake/External-Exiv2.cmake index 2b767c87..fb311efe 100644 --- a/SuperBuild/cmake/External-Exiv2.cmake +++ b/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 -) \ No newline at end of file +) From eb630144a524a2fa59cee1afbb65d1326ce2a406 Mon Sep 17 00:00:00 2001 From: garlac <40228026+garlac@users.noreply.github.com> Date: Sun, 23 Dec 2018 22:29:19 +0530 Subject: [PATCH 2/2] Updated libexiv2 version to 27 Former-commit-id: ac4aa39d7aae691951742e9e5021ac3c0e423137 --- modules/odm_extract_utm/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/odm_extract_utm/CMakeLists.txt b/modules/odm_extract_utm/CMakeLists.txt index c9046003..25214c18 100644 --- a/modules/odm_extract_utm/CMakeLists.txt +++ b/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.