Skip to content

Commit

Permalink
cmake: Install header files without globbing
Browse files Browse the repository at this point in the history
Fixes Exiv2#627

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 0b34ccb)
  • Loading branch information
cryptomilk committed Jan 5, 2019
1 parent 6062b1b commit ed3a0f1
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 4 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ endif()

include(cmake/compilerFlagsExiv2.cmake REQUIRED)

add_subdirectory( include )
add_subdirectory( src )

if( EXIV2_BUILD_UNIT_TESTS )
Expand Down
1 change: 1 addition & 0 deletions include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add_subdirectory(exiv2)
51 changes: 51 additions & 0 deletions include/exiv2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
install(FILES
asfvideo.hpp
basicio.hpp
bigtiffimage.hpp
bmpimage.hpp
config.h
convert.hpp
cr2image.hpp
crwimage.hpp
datasets.hpp
easyaccess.hpp
epsimage.hpp
error.hpp
exif.hpp
exiv2.hpp
futils.hpp
gifimage.hpp
http.hpp
image.hpp
ini.hpp
iptc.hpp
jp2image.hpp
jpgimage.hpp
matroskavideo.hpp
metadatum.hpp
mrwimage.hpp
orfimage.hpp
pgfimage.hpp
pngimage.hpp
preview.hpp
properties.hpp
psdimage.hpp
quicktimevideo.hpp
rafimage.hpp
riffvideo.hpp
rw2image.hpp
rwlock.hpp
slice.hpp
ssh.hpp
tags.hpp
tgaimage.hpp
tiffimage.hpp
types.hpp
utilsvideo.hpp
value.hpp
version.hpp
webpimage.hpp
xmp_exiv2.hpp
xmpsidecar.hpp
DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
4 changes: 0 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,6 @@ install(TARGETS exiv2lib EXPORT exiv2Config
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

install(DIRECTORY ../include/exiv2
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.h*")

install(FILES
${CMAKE_BINARY_DIR}/exv_conf.h
${CMAKE_BINARY_DIR}/exiv2lib_export.h
Expand Down

0 comments on commit ed3a0f1

Please sign in to comment.