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

Simplify CMake code related with PNG and ZLIB (ZLib is required is PNG=ON)

Browse Source
This commit is contained in:
Luis Diaz Mas 2017-08-21 23:21:57 +02:00
parent c735bc5ae2
commit 3a45a375d8
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/CMakeLists.txt
View File

@ -159,15 +159,10 @@ endif( EXIV2_ENABLE_WEBREADY )
##
# add png*.cpp files if PNG support requested
IF( EXIV2_ENABLE_PNG )
IF( ZLIB_FOUND )
SET( LIBEXIV2_SRC ${LIBEXIV2_SRC}
pngchunk.cpp
pngimage.cpp
)
set( LIBEXIV2_HDR ${LIBEXIV2_HDR} ../include/exiv2/pngimage.hpp )
ENDIF( ZLIB_FOUND )
ENDIF( EXIV2_ENABLE_PNG )
if( EXIV2_ENABLE_PNG )
set( LIBEXIV2_SRC ${LIBEXIV2_SRC} pngchunk.cpp pngimage.cpp)
set( LIBEXIV2_HDR ${LIBEXIV2_HDR} ../include/exiv2/pngimage.hpp )
endif()
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@ -236,13 +231,7 @@ if( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
ENDIF()
IF( EXIV2_ENABLE_PNG )
IF( ZLIB_FOUND )
IF( MSVC )
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES} )
ELSE()
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} )
ENDIF()
ENDIF()
TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} )
ENDIF()
IF( EXIV2_ENABLE_NLS )