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

Fix CMake configuration when XMP is disabled. Check XMP variable instead LIBXMP

Browse Source
This commit is contained in:
Luis Diaz Mas 2017-08-20 16:49:41 +02:00
parent 1c9a8a18e4
commit c415e7f509
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/CMakeLists.txt
View File

@ -75,7 +75,7 @@ if (MSVC)
target_sources(metacopy PRIVATE ../src/getopt_win32.c)
endif()
if( EXIV2_ENABLE_LIBXMP )
if( EXIV2_ENABLE_XMP )
add_executable( geotag geotag.cpp)
target_link_libraries( geotag PRIVATE exiv2lib ${ZLIB_LIBRARIES})
install( TARGETS geotag RUNTIME DESTINATION bin)

7
src/CMakeLists.txt
View File

@ -199,7 +199,10 @@ if ( UNIX AND CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" )
set (FREEBSD 1)
endif()
target_include_directories(exiv2lib PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include)
if ( EXIV2_ENABLE_XMP )
target_include_directories(exiv2lib PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include)
endif ()
# TODO : We should not include include/exiv2 but only include !!!
target_include_directories(exiv2lib PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include/exiv2>
@ -233,7 +236,7 @@ else()
target_link_libraries( exiv2lib PUBLIC ${CURL_LIBRARIES} ${SSH_LIBRARIES})
endif()
if( EXIV2_ENABLE_LIBXMP )
if( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
TARGET_LINK_LIBRARIES( exiv2lib PUBLIC xmp )
ENDIF()