Since we are requiring CMake 3.1 we can remove the usage of PRIVATE_VAR and use directly PRIVATE or PUBLIC
This commit is contained in:
Luis Díaz Más
@@ -84,11 +84,6 @@ IF( EXIV2_ENABLE_COMMERCIAL )
|
||||
SET (EXIV2_ENABLE_NLS OFF)
|
||||
ENDIF()
|
||||
|
||||
set (PRIVATE_VAR)
|
||||
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.8)
|
||||
set (PRIVATE_VAR PRIVATE)
|
||||
endif()
|
||||
|
||||
# binary as first, since it workarounds old VS solution compatibility problems
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/include/ ${CMAKE_SOURCE_DIR}/include/exiv2/)
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ FOREACH(entry ${SAMPLES})
|
||||
STRING( REPLACE ".cpp" "" target ${entry})
|
||||
ADD_EXECUTABLE( ${target} ${target}.cpp )
|
||||
ADD_TEST( ${target}_test ${target} )
|
||||
TARGET_LINK_LIBRARIES( ${target} ${PRIVATE_VAR} exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES})
|
||||
INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
ENDFOREACH(entry ${SAMPLES})
|
||||
|
||||
@@ -61,25 +61,25 @@ ENDIF( MSVC )
|
||||
|
||||
SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
|
||||
ADD_EXECUTABLE( metacopy ${MC_SRC} )
|
||||
TARGET_LINK_LIBRARIES( metacopy ${PRIVATE_VAR} exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES( metacopy PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
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_VAR} exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES( pathtest PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL ( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
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_VAR} ${PRIVATE_VAR} exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES( exiv2json PRIVATE exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
SET( GEOTAG_SRC geotag.cpp )
|
||||
ADD_EXECUTABLE( geotag ${GEOTAG_SRC} )
|
||||
SET_TARGET_PROPERTIES( geotag PROPERTIES OUTPUT_NAME geotag )
|
||||
TARGET_LINK_LIBRARIES( geotag ${PRIVATE_VAR} exiv2lib ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES( geotag PRIVATE exiv2lib ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL( TARGETS geotag ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
# ******************************************************************************
|
||||
|
||||
+18
-27
@@ -260,60 +260,51 @@ if ( MSVC )
|
||||
if ( EXIV2_ENABLE_STATIC )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib zlibstatic ${ZLIB_LIBRARIES} )
|
||||
else()
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${ZLIB_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} )
|
||||
endif()
|
||||
source_group("Header Files" FILES ${LIBEXIV2_HDR} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${ZLIB_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
|
||||
source_group("Header Files" FILES ${LIBCURL_HDR} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} )
|
||||
source_group("Header Files" FILES ${SSH_HDR} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES}
|
||||
${CURL_LIBRARIES} ${SSH_LIBRARIES})
|
||||
else()
|
||||
if ( UNIX AND NOT FREEBSD )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CMAKE_THREAD_LIBS_INIT} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${EXPAT_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CURL_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${SSH_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CMAKE_THREAD_LIBS_INIT} )
|
||||
else()
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_THREAD_LIBS_INIT} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CMAKE_THREAD_LIBS_INIT} )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if( EXIV2_ENABLE_LIBXMP )
|
||||
ADD_DEPENDENCIES( exiv2lib xmp )
|
||||
if ( MSVC )
|
||||
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))
|
||||
else()
|
||||
ADD_DEPENDENCIES( exiv2lib xmp)
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||
endif(MSVC)
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} xmp )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PUBLIC xmp )
|
||||
ENDIF()
|
||||
|
||||
IF( EXIV2_ENABLE_PNG )
|
||||
IF( ZLIB_FOUND )
|
||||
IF( MSVC )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} optimized ${ZLIB_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES} )
|
||||
ELSE()
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${ZLIB_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} )
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF( EXIV2_ENABLE_NLS )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${LIBINTL_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} )
|
||||
ENDIF( EXIV2_ENABLE_NLS )
|
||||
|
||||
IF( ICONV_FOUND )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${ICONV_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ICONV_LIBRARIES} )
|
||||
ENDIF( ICONV_FOUND )
|
||||
|
||||
IF (CYGWIN OR MINGW)
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} psapi ws2_32 )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi ws2_32 )
|
||||
ENDIF(CYGWIN OR MINGW)
|
||||
|
||||
INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
@@ -330,7 +321,7 @@ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
# ******************************************************************************
|
||||
# connection test application
|
||||
ADD_EXECUTABLE( conntest ${CONNTEST} )
|
||||
TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} )
|
||||
TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} )
|
||||
|
||||
# ******************************************************************************
|
||||
# exifprint application
|
||||
|
||||
Reference in New Issue
Block a user