|
 |
f68f66 |
From 0b34ccb9a3b26cd1c5267c6a5c15e9fa1a665adb Mon Sep 17 00:00:00 2001
|
|
|
f68f66 |
From: Andreas Schneider <asn@cryptomilk.org>
|
|
|
f68f66 |
Date: Wed, 2 Jan 2019 10:59:30 +0100
|
|
|
f68f66 |
Subject: [PATCH 65/70] cmake: Install header files without globbing
|
|
|
f68f66 |
|
|
|
f68f66 |
Fixes #627
|
|
|
f68f66 |
|
|
|
f68f66 |
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
|
|
f68f66 |
---
|
|
|
f68f66 |
CMakeLists.txt | 1 +
|
|
|
f68f66 |
include/CMakeLists.txt | 1 +
|
|
|
f68f66 |
include/exiv2/CMakeLists.txt | 51 ++++++++++++++++++++++++++++++++++++
|
|
|
f68f66 |
src/CMakeLists.txt | 4 ---
|
|
|
f68f66 |
4 files changed, 53 insertions(+), 4 deletions(-)
|
|
|
f68f66 |
create mode 100644 include/CMakeLists.txt
|
|
|
f68f66 |
create mode 100644 include/exiv2/CMakeLists.txt
|
|
|
f68f66 |
|
|
|
f68f66 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
f68f66 |
index 183cdd2e..ce4d2202 100644
|
|
|
f68f66 |
--- a/CMakeLists.txt
|
|
|
f68f66 |
+++ b/CMakeLists.txt
|
|
|
f68f66 |
@@ -76,6 +76,7 @@ endif()
|
|
|
f68f66 |
|
|
|
f68f66 |
include(cmake/compilerFlagsExiv2.cmake REQUIRED)
|
|
|
f68f66 |
|
|
|
f68f66 |
+add_subdirectory( include )
|
|
|
f68f66 |
add_subdirectory( src )
|
|
|
f68f66 |
|
|
|
f68f66 |
if( EXIV2_BUILD_UNIT_TESTS )
|
|
|
f68f66 |
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
|
|
|
f68f66 |
new file mode 100644
|
|
|
f68f66 |
index 00000000..01b43a6c
|
|
|
f68f66 |
--- /dev/null
|
|
|
f68f66 |
+++ b/include/CMakeLists.txt
|
|
|
f68f66 |
@@ -0,0 +1 @@
|
|
|
f68f66 |
+add_subdirectory(exiv2)
|
|
|
f68f66 |
diff --git a/include/exiv2/CMakeLists.txt b/include/exiv2/CMakeLists.txt
|
|
|
f68f66 |
new file mode 100644
|
|
|
f68f66 |
index 00000000..60080f1c
|
|
|
f68f66 |
--- /dev/null
|
|
|
f68f66 |
+++ b/include/exiv2/CMakeLists.txt
|
|
|
f68f66 |
@@ -0,0 +1,51 @@
|
|
|
f68f66 |
+install(FILES
|
|
|
f68f66 |
+ asfvideo.hpp
|
|
|
f68f66 |
+ basicio.hpp
|
|
|
f68f66 |
+ bigtiffimage.hpp
|
|
|
f68f66 |
+ bmpimage.hpp
|
|
|
f68f66 |
+ config.h
|
|
|
f68f66 |
+ convert.hpp
|
|
|
f68f66 |
+ cr2image.hpp
|
|
|
f68f66 |
+ crwimage.hpp
|
|
|
f68f66 |
+ datasets.hpp
|
|
|
f68f66 |
+ easyaccess.hpp
|
|
|
f68f66 |
+ epsimage.hpp
|
|
|
f68f66 |
+ error.hpp
|
|
|
f68f66 |
+ exif.hpp
|
|
|
f68f66 |
+ exiv2.hpp
|
|
|
f68f66 |
+ futils.hpp
|
|
|
f68f66 |
+ gifimage.hpp
|
|
|
f68f66 |
+ http.hpp
|
|
|
f68f66 |
+ image.hpp
|
|
|
f68f66 |
+ ini.hpp
|
|
|
f68f66 |
+ iptc.hpp
|
|
|
f68f66 |
+ jp2image.hpp
|
|
|
f68f66 |
+ jpgimage.hpp
|
|
|
f68f66 |
+ matroskavideo.hpp
|
|
|
f68f66 |
+ metadatum.hpp
|
|
|
f68f66 |
+ mrwimage.hpp
|
|
|
f68f66 |
+ orfimage.hpp
|
|
|
f68f66 |
+ pgfimage.hpp
|
|
|
f68f66 |
+ pngimage.hpp
|
|
|
f68f66 |
+ preview.hpp
|
|
|
f68f66 |
+ properties.hpp
|
|
|
f68f66 |
+ psdimage.hpp
|
|
|
f68f66 |
+ quicktimevideo.hpp
|
|
|
f68f66 |
+ rafimage.hpp
|
|
|
f68f66 |
+ riffvideo.hpp
|
|
|
f68f66 |
+ rw2image.hpp
|
|
|
f68f66 |
+ rwlock.hpp
|
|
|
f68f66 |
+ slice.hpp
|
|
|
f68f66 |
+ ssh.hpp
|
|
|
f68f66 |
+ tags.hpp
|
|
|
f68f66 |
+ tgaimage.hpp
|
|
|
f68f66 |
+ tiffimage.hpp
|
|
|
f68f66 |
+ types.hpp
|
|
|
f68f66 |
+ utilsvideo.hpp
|
|
|
f68f66 |
+ value.hpp
|
|
|
f68f66 |
+ version.hpp
|
|
|
f68f66 |
+ webpimage.hpp
|
|
|
f68f66 |
+ xmp_exiv2.hpp
|
|
|
f68f66 |
+ xmpsidecar.hpp
|
|
|
f68f66 |
+ DESTINATION
|
|
|
f68f66 |
+ ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
|
|
|
f68f66 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
f68f66 |
index adb285b1..04d8a2a0 100644
|
|
|
f68f66 |
--- a/src/CMakeLists.txt
|
|
|
f68f66 |
+++ b/src/CMakeLists.txt
|
|
|
f68f66 |
@@ -225,10 +225,6 @@ install(TARGETS exiv2lib EXPORT exiv2Config
|
|
|
f68f66 |
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
f68f66 |
)
|
|
|
f68f66 |
|
|
|
f68f66 |
-install(DIRECTORY ../include/exiv2
|
|
|
f68f66 |
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
|
f68f66 |
- FILES_MATCHING PATTERN "*.h*")
|
|
|
f68f66 |
-
|
|
|
f68f66 |
install(FILES
|
|
|
f68f66 |
${CMAKE_BINARY_DIR}/exv_conf.h
|
|
|
f68f66 |
${CMAKE_BINARY_DIR}/exiv2lib_export.h
|
|
|
f68f66 |
--
|
|
|
f68f66 |
2.17.2
|
|
|
f68f66 |
|