From d0f9c91faf9ad7babe23d44ae9f36d1c571d40b8 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 3 Sep 2018 16:23:51 -0400 Subject: [PATCH] Use exiv2lib version from SuperBuild directory --- SuperBuild/cmake/External-Exiv2.cmake | 20 ++++++++++++++++++++ modules/odm_extract_utm/CMakeLists.txt | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 SuperBuild/cmake/External-Exiv2.cmake diff --git a/SuperBuild/cmake/External-Exiv2.cmake b/SuperBuild/cmake/External-Exiv2.cmake new file mode 100644 index 00000000..2b767c87 --- /dev/null +++ b/SuperBuild/cmake/External-Exiv2.cmake @@ -0,0 +1,20 @@ +set(_proj_name exiv2lib) +set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}") + +ExternalProject_Add(${_proj_name} + PREFIX ${_SB_BINARY_DIR} + 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 + SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name} + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX=${SB_INSTALL_DIR} + -DCMAKE_INSTALL_LIBDIR=lib + BUILD_IN_SOURCE ON + BUILD_COMMAND make exiv2lib + INSTALL_DIR ${SB_INSTALL_DIR} + LOG_DOWNLOAD OFF + LOG_CONFIGURE OFF + LOG_BUILD OFF +) \ No newline at end of file diff --git a/modules/odm_extract_utm/CMakeLists.txt b/modules/odm_extract_utm/CMakeLists.txt index 069466fd..c6140cb5 100644 --- a/modules/odm_extract_utm/CMakeLists.txt +++ b/modules/odm_extract_utm/CMakeLists.txt @@ -4,7 +4,8 @@ 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" PATHS "../SuperBuild/install/lib") +find_library(EXIV2_LIBRARY "libexiv2.so" PATHS "${PROJECT_SOURCE_DIR}/../../SuperBuild/install/lib") +include_directories("${PROJECT_SOURCE_DIR}/../../SuperBuild/install/include") # Add compiler options. add_definitions(-Wall -Wextra)