|
 |
f68f66 |
From 420e4631da1372da1be06af8f6032429c1f14d02 Mon Sep 17 00:00:00 2001
|
|
|
f68f66 |
From: Andreas Schneider <asn@cryptomilk.org>
|
|
|
f68f66 |
Date: Thu, 3 Jan 2019 10:18:27 +0100
|
|
|
f68f66 |
Subject: [PATCH 67/70] cmake: Use correct installation dir for cmake config
|
|
|
f68f66 |
files
|
|
|
f68f66 |
|
|
|
f68f66 |
This is the path cmake will look for those files by default. At least on
|
|
|
f68f66 |
UNIX systems.
|
|
|
f68f66 |
|
|
|
f68f66 |
Fixes #623
|
|
|
f68f66 |
|
|
|
f68f66 |
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
|
|
f68f66 |
---
|
|
|
f68f66 |
releasenotes/CYGWIN/ReadMe.txt | 2 +-
|
|
|
f68f66 |
releasenotes/Darwin/ReadMe.txt | 2 +-
|
|
|
f68f66 |
releasenotes/Linux/ReadMe.txt | 1 +
|
|
|
f68f66 |
releasenotes/MinGW/ReadMe.txt | 2 +-
|
|
|
f68f66 |
releasenotes/msvc/ReadMe.txt | 2 +-
|
|
|
f68f66 |
releasenotes/releasenotes.txt | 5 +++++
|
|
|
f68f66 |
src/CMakeLists.txt | 2 +-
|
|
|
f68f66 |
7 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt
|
|
|
f68f66 |
index 9161ca34..bba70fe6 100644
|
|
|
f68f66 |
--- a/releasenotes/CYGWIN/ReadMe.txt
|
|
|
f68f66 |
+++ b/releasenotes/CYGWIN/ReadMe.txt
|
|
|
f68f66 |
@@ -7,9 +7,9 @@ Structure of the bundle:
|
|
|
f68f66 |
bin/exiv2.exe exiv2 and sample applications
|
|
|
f68f66 |
bin/cygexiv2-27.dll DLL
|
|
|
f68f66 |
lib/libexiv2.dll.a & libxmp.a link libraries
|
|
|
f68f66 |
+lib/cmake/exiv2 consume CMake files
|
|
|
f68f66 |
lib/pkgconfig/exiv2.pc pkg-config file
|
|
|
f68f66 |
share/man man pages
|
|
|
f68f66 |
-share/exiv2/cmake consume CMake files
|
|
|
f68f66 |
samples/exifprint.cpp sample code
|
|
|
f68f66 |
logs build and test logs
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt
|
|
|
f68f66 |
index d3e61177..57910713 100644
|
|
|
f68f66 |
--- a/releasenotes/Darwin/ReadMe.txt
|
|
|
f68f66 |
+++ b/releasenotes/Darwin/ReadMe.txt
|
|
|
f68f66 |
@@ -6,10 +6,10 @@ Structure of the bundle
|
|
|
f68f66 |
|
|
|
f68f66 |
bin/exiv2 exiv2 and sample applications
|
|
|
f68f66 |
lib/libexiv2.0.27.0.0.dylib & libxmp.a libraries
|
|
|
f68f66 |
+lib/cmake/exiv2 consume CMake files
|
|
|
f68f66 |
lib/pkgconfig/exiv2.pc pkg-config file
|
|
|
f68f66 |
include/exiv2/ include files
|
|
|
f68f66 |
share/man man pages
|
|
|
f68f66 |
-share/exiv2/cmake consume CMake files
|
|
|
f68f66 |
samples/exifprint.cpp sample code
|
|
|
f68f66 |
logs build and test logs
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt
|
|
|
f68f66 |
index 03348302..0737b3a4 100644
|
|
|
f68f66 |
--- a/releasenotes/Linux/ReadMe.txt
|
|
|
f68f66 |
+++ b/releasenotes/Linux/ReadMe.txt
|
|
|
f68f66 |
@@ -7,6 +7,7 @@ Structure of the bundle:
|
|
|
f68f66 |
bin/exiv2 exiv2 and sample applications
|
|
|
f68f66 |
lib/libexiv2.so.0.27.0.0 & libxmp.a libraries
|
|
|
f68f66 |
lib/pkgconfig/exiv2.pc pkg-config file
|
|
|
f68f66 |
+lib/cmake/exiv2 consume CMake files
|
|
|
f68f66 |
include/exiv2/ include files
|
|
|
f68f66 |
share/ man pages
|
|
|
f68f66 |
samples/exifprint.cpp sample code
|
|
|
f68f66 |
diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt
|
|
|
f68f66 |
index 884d7502..98cd7770 100644
|
|
|
f68f66 |
--- a/releasenotes/MinGW/ReadMe.txt
|
|
|
f68f66 |
+++ b/releasenotes/MinGW/ReadMe.txt
|
|
|
f68f66 |
@@ -7,10 +7,10 @@ Structure of the bundle:
|
|
|
f68f66 |
bin/exiv2.exe exiv2 and sample applications
|
|
|
f68f66 |
bin/msys-exiv2-27.dll exiv2 dll
|
|
|
f68f66 |
lib/libexiv2.dll.a & libxmp.a link libraries
|
|
|
f68f66 |
+lib/cmake/exiv2 consume CMake files
|
|
|
f68f66 |
lib/pkgconfig/exiv2.pc pkg-config file
|
|
|
f68f66 |
include/exiv2/ include files
|
|
|
f68f66 |
share/man man pages
|
|
|
f68f66 |
-share/exiv2/cmake consume CMake files
|
|
|
f68f66 |
samples/exifprint.cpp sample code
|
|
|
f68f66 |
logs build and test logs
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt
|
|
|
f68f66 |
index de1dcbfe..e625ab49 100644
|
|
|
f68f66 |
--- a/releasenotes/msvc/ReadMe.txt
|
|
|
f68f66 |
+++ b/releasenotes/msvc/ReadMe.txt
|
|
|
f68f66 |
@@ -7,8 +7,8 @@ Structure of the bundle:
|
|
|
f68f66 |
bin/exiv2.exe exiv2 and sample applications
|
|
|
f68f66 |
bin/exiv2.dll dll
|
|
|
f68f66 |
lib/exiv2.lib & xmp.lib link libraries
|
|
|
f68f66 |
+lib/cmake/exiv2 consume CMake files
|
|
|
f68f66 |
include/exiv2/ include files
|
|
|
f68f66 |
-share/exiv2/cmake consume CMake files
|
|
|
f68f66 |
samples/exifprint.cpp sample code
|
|
|
f68f66 |
logs build and test logs
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt
|
|
|
f68f66 |
index b71b4519..226c078b 100644
|
|
|
f68f66 |
--- a/releasenotes/releasenotes.txt
|
|
|
f68f66 |
+++ b/releasenotes/releasenotes.txt
|
|
|
f68f66 |
@@ -1,3 +1,8 @@
|
|
|
f68f66 |
+Exiv2 v0.27.1
|
|
|
f68f66 |
+-------------
|
|
|
f68f66 |
+
|
|
|
f68f66 |
+#623 Use correct installation path for generated docs and cmake config files
|
|
|
f68f66 |
+
|
|
|
f68f66 |
Exiv2 v0.27.0
|
|
|
f68f66 |
-------------
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
f68f66 |
index adb285b1..4a05ee4f 100644
|
|
|
f68f66 |
--- a/src/CMakeLists.txt
|
|
|
f68f66 |
+++ b/src/CMakeLists.txt
|
|
|
f68f66 |
@@ -234,7 +234,7 @@ install(FILES
|
|
|
f68f66 |
${CMAKE_BINARY_DIR}/exiv2lib_export.h
|
|
|
f68f66 |
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
|
|
|
f68f66 |
|
|
|
f68f66 |
-install(EXPORT exiv2Config DESTINATION "share/exiv2/cmake")
|
|
|
f68f66 |
+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
|
|
|
f68f66 |
|
|
|
f68f66 |
# ******************************************************************************
|
|
|
f68f66 |
# exiv2 application
|
|
|
f68f66 |
--
|
|
|
f68f66 |
2.17.2
|
|
|
f68f66 |
|