From f13033b5f4c7ec0ef5878ce7f30696bd52491a4a Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Mon, 3 Oct 2016 16:55:54 +0000
Subject: [PATCH] #1230 CMake build fixes.

---
 CMakeLists.txt         |  3 ++-
 samples/CMakeLists.txt | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d83a2869..ce937457 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,7 +195,8 @@ ENDIF( EXIV2_ENABLE_BUILD_PO )
 
 ##
 # tests
-ADD_CUSTOM_TARGET(tests COMMAND env EXIV2_BINDIR="${CMAKE_BINARY_DIR}"/bin make tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
+ADD_CUSTOM_TARGET(tests       COMMAND env EXIV2_BINDIR="${CMAKE_BINARY_DIR}"/bin make tests       WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
+ADD_CUSTOM_TARGET(geotag-test COMMAND env EXIV2_BINDIR="${CMAKE_BINARY_DIR}"/bin make geotag-test WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
 
 ##
 # http://dev.exiv2.org/boards/3/topics/1364
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 1add0951..979b7693 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -19,7 +19,6 @@ SET( SAMPLES addmoddel.cpp
              exifdata.cpp
              exifprint.cpp
              exifvalue.cpp
-             geotag.cpp
              ini-test.cpp
              iotest.cpp
              iptceasy.cpp
@@ -62,20 +61,26 @@ ENDIF( MSVC )
 
 SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
 ADD_EXECUTABLE( metacopy ${MC_SRC} )
-TARGET_LINK_LIBRARIES( metacopy exiv2lib Threads::Threads)
+TARGET_LINK_LIBRARIES( metacopy ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
 INSTALL( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
 
-SET( PATHTEST_SRC ${PATHTEST_SRC}  path-test.cpp ../src/utils.cpp )
-ADD_EXECUTABLE( pathtest ${PATHTEST_SRC} )
-SET_TARGET_PROPERTIES( pathtest PROPERTIES OUTPUT_NAME path-test )
-TARGET_LINK_LIBRARIES( pathtest exiv2lib Threads::Threads )
-INSTALL( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
+SET   ( PATHTEST_SRC             ${PATHTEST_SRC}  path-test.cpp ../src/utils.cpp )
+ADD_EXECUTABLE       ( pathtest  ${PATHTEST_SRC} )
+SET_TARGET_PROPERTIES( pathtest  PROPERTIES OUTPUT_NAME path-test )
+TARGET_LINK_LIBRARIES( pathtest  ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
+INSTALL      ( TARGETS pathtest  ${INSTALL_TARGET_STANDARD_ARGS} )
 
-SET( EXIV2JSON_SRC exiv2json.cpp Jzon.cpp )
-ADD_EXECUTABLE( exiv2json ${EXIV2JSON_SRC} )
+SET( EXIV2JSON_SRC     exiv2json.cpp Jzon.cpp )
+ADD_EXECUTABLE(        exiv2json ${EXIV2JSON_SRC} )
 SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
-TARGET_LINK_LIBRARIES( exiv2json exiv2lib Threads::Threads)
-INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
+TARGET_LINK_LIBRARIES( exiv2json ${PRIVATE_VAR} ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
+INSTALL( TARGETS       exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
+
+SET( GEOTAG_SRC        geotag.cpp )
+ADD_EXECUTABLE(        geotag    ${GEOTAG_SRC} )
+SET_TARGET_PROPERTIES( geotag    PROPERTIES OUTPUT_NAME geotag )
+TARGET_LINK_LIBRARIES( geotag    ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
+INSTALL( TARGETS       geotag    ${INSTALL_TARGET_STANDARD_ARGS} )
 
 # ******************************************************************************
 # Man page