From 78676b2a025023ab3de2d094e0798ed64ef7df97 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 27 Apr 2019 11:18:22 +0100 Subject: [PATCH] Fix #798 --- README.md | 2 +- releasenotes/CYGWIN/ReadMe.txt | 17 +---------------- releasenotes/Darwin/ReadMe.txt | 6 ++---- releasenotes/Linux/ReadMe.txt | 2 +- releasenotes/MinGW/ReadMe.txt | 2 +- releasenotes/msvc/ReadMe.txt | 2 +- src/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 6e9f50a9..92cca39e 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ project(exifprint VERSION 0.0.1 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) -find_package(exiv2 REQUIRED CONFIG NAMES exiv2) # search ${CMAKE_INSTALL_PREFIX}/lib/exiv2/cmake/ +find_package(exiv2 REQUIRED CONFIG NAMES exiv2) # search ${CMAKE_INSTALL_PREFIX}/lib/cmake/exiv2 add_executable(exifprint ../samples/exifprint.cpp) # compile this target_link_libraries(exifprint exiv2lib) # link exiv2lib diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt index 0f7dd39a..43a0cb36 100644 --- a/releasenotes/CYGWIN/ReadMe.txt +++ b/releasenotes/CYGWIN/ReadMe.txt @@ -7,7 +7,7 @@ Structure of the bundle: bin/exiv2.exe exiv2 and sample applications bin/cygexiv2-27.dll DLL lib/libexiv2.dll.a & libexiv2-xmp.a link libraries -lib/exiv2/cmake/ CMake support/consume files +lib/cmake/exiv2 CMake support/consume files lib/pkgconfig/exiv2.pc pkg-config file share/man/ man pages share/locale/ localisation files @@ -42,10 +42,6 @@ $ cd $ g++ -std=gnu++98 samples/exifprint.cpp -I/usr/local/include -L/usr/local/lib -lexiv2 -o exifprint $ export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" $ ./exifprint --version -exiv2=0.27.1 -... -xmlns=xmpidq:http://ns.adobe.com/xmp/Identifier/qual/1.0/ -$ Method 2: Use pkg-config to set include and linking options $ cd @@ -54,14 +50,3 @@ $ export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" $ g++ -std=gnu++98 samples/exifprint.cpp -o exifprint $(pkg-config exiv2 --libs --cflags) $ ./exifprint - - -To compile and link your own code using installed library and include files ---------------------------------------------------------------------------- -$ g++ -std=gnu++98 samples/exifprint.cpp -I/usr/include -I/usr/local/include -L/usr/local/lib -lexiv2 -o exifprint -$ export PATH="/usr/local/bin:$PATH" -$ ./exifprint --version -exiv2=0.27.1 -... -xmlns=xmpidq:http://ns.adobe.com/xmp/Identifier/qual/1.0/ -$ diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt index 42a8eaba..37380202 100644 --- a/releasenotes/Darwin/ReadMe.txt +++ b/releasenotes/Darwin/ReadMe.txt @@ -7,7 +7,7 @@ Structure of the bundle bin/exiv2 exiv2 and sample applications lib/libexiv2.0.27.1.0.dylib & libexiv2-xmp.a libraries lib/pkgconfig/exiv2.pc pkg-config file -lib/exiv2/cmake/ CMake support/consume files +lib/cmake/exiv2 CMake support/consume files include/exiv2/ include files share/man/ man pages share/locale/ localisation files @@ -52,6 +52,4 @@ $ g++ -std=c++98 samples/exifprint.cpp -o exifprint $(pkg-config exiv2 --libs -- $ ./exifprint Method 3: Use the CMake support/consume files -See file: README.md Section: 2.6 "Consuming Exiv2 with CMake" - - +See file: README.md Section: 2.6 "Consuming Exiv2 with CMake" \ No newline at end of file diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt index 6f1d61f1..bcd8173a 100644 --- a/releasenotes/Linux/ReadMe.txt +++ b/releasenotes/Linux/ReadMe.txt @@ -7,7 +7,7 @@ Structure of the bundle: bin/exiv2 exiv2 and sample applications lib/libexiv2.so.0.27.1.0 & libexiv2-xmp.a libraries lib/pkgconfig/exiv2.pc pkg-config file -lib/exiv2/cmake/ CMake support/consume files +lib/cmake/exiv2 CMake support/consume files include/exiv2/ include files share/man/ man pages share/locale/ localisation files diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt index 12c4908c..7b1103cf 100644 --- a/releasenotes/MinGW/ReadMe.txt +++ b/releasenotes/MinGW/ReadMe.txt @@ -8,7 +8,7 @@ bin/exiv2.exe exiv2 and sample applications bin/msys-exiv2-27.dll exiv2 dll lib/libexiv2.dll.a & libexiv2-xmp.a link libraries lib/pkgconfig/exiv2.pc pkg-config file -lib/exiv2/cmake/ CMake support/consume files +lib/cmake/exiv2 CMake support/consume files include/exiv2/ include files share/man/ man pages share/locale/ localisation files diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt index 3c61e620..5f351db5 100644 --- a/releasenotes/msvc/ReadMe.txt +++ b/releasenotes/msvc/ReadMe.txt @@ -8,7 +8,7 @@ Structure of the bundle: bin/exiv2.exe exiv2 and sample applications bin/exiv2.dll dll lib/exiv2.lib & exiv2-xmp.lib link libraries -lib/exiv2/cmake/ CMake support/consume files +lib/cmake/exiv2 CMake support/consume files include/exiv2/ include files samples/exifprint.cpp sample code logs/ build and test logs diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 34087004..97632777 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -239,7 +239,7 @@ install(FILES ${CMAKE_BINARY_DIR}/exiv2lib_export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) -install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") +install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")