From 73047ce568b2cf7611ecbc8194b49b85b4f27efa Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 27 Mar 2017 09:04:12 +0000 Subject: [PATCH] #1279 Correction to r4748 which broke the CMake build. --- include/exiv2/exiv2.hpp | 1 + samples/ini-test.cpp | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/exiv2/exiv2.hpp b/include/exiv2/exiv2.hpp index e31e6cb0..193989df 100644 --- a/include/exiv2/exiv2.hpp +++ b/include/exiv2/exiv2.hpp @@ -45,6 +45,7 @@ #include "gifimage.hpp" #include "http.hpp" #include "image.hpp" +#include "ini.hpp" #include "iptc.hpp" #include "jp2image.hpp" #include "jpgimage.hpp" diff --git a/samples/ini-test.cpp b/samples/ini-test.cpp index b8e17447..fc446f74 100644 --- a/samples/ini-test.cpp +++ b/samples/ini-test.cpp @@ -13,7 +13,7 @@ Config loaded from : 'initest.ini' version=6, name=Bob Smith, email=bob@smith.co // #include #include "config.h" -#include "../src/ini_int.hpp" +#include "ini.hpp" int main() { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0f226fd3..aecd6215 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,6 @@ SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp cr2image_int.hpp crwimage_int.hpp fujimn_int.hpp - ini_int.hpp makernote_int.hpp minoltamn_int.hpp nikonmn_int.hpp @@ -55,6 +54,7 @@ SET( LIBEXIV2_HDR ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/asfvideo.hp ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/gifimage.hpp ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/http.hpp ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/image.hpp + ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/ini.hpp ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/iptc.hpp ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/jp2image.hpp ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/jpgimage.hpp