third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26 from piponazo/fixInstallExvConf

Browse Source 
Fix installation of exv_conf.h
This commit is contained in:
Robin Mills 2017-08-14 10:53:34 +01:00 committed by GitHub
commit ad512ec4b5
5 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -106,12 +106,6 @@ include_directories(${CMAKE_BINARY_DIR}) # Make the exv_conf.h file visible for
include( config/CMakeChecks.txt )
SET( INSTALL_TARGET_STANDARD_ARGS
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
##
# add sources from XMPSDK directory
# this needs to be done here to be visible to xmpsdk, src and sample sub directories

2
config/CMakeChecks.txt
View File

@ -44,8 +44,6 @@ IF( EXIV2_ENABLE_COMMERCIAL )
ADD_DEFINITIONS( -DEXV_COMMERCIAL_VERSION )
ENDIF( EXIV2_ENABLE_COMMERCIAL )
INSTALL( FILES ${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf.h DESTINATION include/exiv2 )
CONFIGURE_FILE(config/exiv2_uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY)
ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")

10
samples/CMakeLists.txt
View File

@ -49,7 +49,7 @@ FOREACH(entry ${SAMPLES})
ADD_EXECUTABLE( ${target} ${target}.cpp )
ADD_TEST( ${target}_test ${target} )
TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES})
INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
INSTALL( TARGETS ${target} RUNTIME DESTINATION bin)
ENDFOREACH(entry ${SAMPLES})
###################################
@ -62,26 +62,26 @@ ENDIF( MSVC )
SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
ADD_EXECUTABLE( metacopy ${MC_SRC} )
TARGET_LINK_LIBRARIES( metacopy PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
INSTALL( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
INSTALL( TARGETS metacopy RUNTIME DESTINATION bin)
SET ( PATHTEST_SRC ${PATHTEST_SRC} path-test.cpp ../src/utils.cpp )
ADD_EXECUTABLE ( pathtest ${PATHTEST_SRC} )
SET_TARGET_PROPERTIES( pathtest PROPERTIES OUTPUT_NAME path-test )
TARGET_LINK_LIBRARIES( pathtest PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
INSTALL ( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
INSTALL ( TARGETS pathtest RUNTIME DESTINATION bin)
SET( EXIV2JSON_SRC exiv2json.cpp Jzon.cpp )
ADD_EXECUTABLE( exiv2json ${EXIV2JSON_SRC} )
SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
TARGET_LINK_LIBRARIES( exiv2json PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
INSTALL( TARGETS exiv2json RUNTIME DESTINATION bin)
if( EXIV2_ENABLE_LIBXMP )
SET( GEOTAG_SRC geotag.cpp )
ADD_EXECUTABLE( geotag ${GEOTAG_SRC} )
SET_TARGET_PROPERTIES( geotag PROPERTIES OUTPUT_NAME geotag )
TARGET_LINK_LIBRARIES( geotag PRIVATE exiv2lib ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
INSTALL( TARGETS geotag ${INSTALL_TARGET_STANDARD_ARGS} )
INSTALL( TARGETS geotag RUNTIME DESTINATION bin)
endif()
# ******************************************************************************

107
src/CMakeLists.txt
View File

@ -37,51 +37,52 @@ SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp
)
# Add standalone C++ header files to this list
SET( LIBEXIV2_HDR ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/asfvideo.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/basicio.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/bmpimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/config.h
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/convert.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/cr2image.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/crwimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/datasets.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/easyaccess.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/epsimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/error.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/exif.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/exiv2.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/futils.hpp
${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
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/matroskavideo.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/metadatum.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/mrwimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/orfimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/pgfimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/preview.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/properties.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/psdimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/quicktimevideo.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/rafimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/riffvideo.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/rwlock.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/rw2image.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/tags.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/tgaimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/tiffimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/types.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/utilsvideo.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/value.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/version.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/webpimage.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/xmp.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/xmpsidecar.hpp
${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/utilsvideo.hpp
SET( LIBEXIV2_HDR ../include/exiv2/asfvideo.hpp
../include/exiv2/basicio.hpp
../include/exiv2/bmpimage.hpp
../include/exiv2/config.h
../include/exiv2/convert.hpp
../include/exiv2/cr2image.hpp
../include/exiv2/crwimage.hpp
../include/exiv2/datasets.hpp
../include/exiv2/easyaccess.hpp
../include/exiv2/epsimage.hpp
../include/exiv2/error.hpp
../include/exiv2/exif.hpp
../include/exiv2/exiv2.hpp
../include/exiv2/futils.hpp
../include/exiv2/gifimage.hpp
../include/exiv2/http.hpp
../include/exiv2/image.hpp
../include/exiv2/ini.hpp
../include/exiv2/iptc.hpp
../include/exiv2/jp2image.hpp
../include/exiv2/jpgimage.hpp
../include/exiv2/matroskavideo.hpp
../include/exiv2/metadatum.hpp
../include/exiv2/mrwimage.hpp
../include/exiv2/orfimage.hpp
../include/exiv2/pgfimage.hpp
../include/exiv2/preview.hpp
../include/exiv2/properties.hpp
../include/exiv2/psdimage.hpp
../include/exiv2/quicktimevideo.hpp
../include/exiv2/rafimage.hpp
../include/exiv2/riffvideo.hpp
../include/exiv2/rwlock.hpp
../include/exiv2/rw2image.hpp
../include/exiv2/tags.hpp
../include/exiv2/tgaimage.hpp
../include/exiv2/tiffimage.hpp
../include/exiv2/types.hpp
../include/exiv2/utilsvideo.hpp
../include/exiv2/value.hpp
../include/exiv2/version.hpp
../include/exiv2/webpimage.hpp
../include/exiv2/xmp.hpp
../include/exiv2/xmpsidecar.hpp
../include/exiv2/utilsvideo.hpp
${CMAKE_BINARY_DIR}/exv_conf.h
)
# Add library C++ source files to this list
@ -307,7 +308,14 @@ IF (CYGWIN OR MINGW)
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi ws2_32 )
ENDIF(CYGWIN OR MINGW)
INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
install(TARGETS exiv2lib
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
install(FILES ${LIBEXIV2_HDR}
DESTINATION include/exiv2
)
include(../CMake_msvc.txt)
msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME})
@ -316,7 +324,9 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME})
# exiv2 application
ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} )
TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
install(TARGETS exiv2
RUNTIME DESTINATION bin
)
# ******************************************************************************
# connection test application
@ -333,9 +343,6 @@ TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRAR
ADD_EXECUTABLE( remotetest ${REMOTETEST} )
TARGET_LINK_LIBRARIES( remotetest exiv2lib ${LIBINTL_LIBRARIES} )
# ******************************************************************************
# Headers
INSTALL( FILES ${LIBEXIV2_HDR} DESTINATION include/exiv2 )
# ******************************************************************************
# Man page

6
xmpsdk/CMakeLists.txt
View File

@ -40,8 +40,12 @@ IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
endif()
target_link_libraries(xmp PUBLIC ${EXPAT_LIBRARIES})
# 1119 Install libxmp.a for use by third party applications (Thanks, Emmanuel)
INSTALL(TARGETS xmp ${INSTALL_TARGET_STANDARD_ARGS} )
INSTALL(TARGETS xmp
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
ENDIF()
# That's all Folks!