From 3a45a375d8b4a6236a310a0c3edcb431ec0fe96d Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Mon, 21 Aug 2017 23:21:57 +0200 Subject: [PATCH] Simplify CMake code related with PNG and ZLIB (ZLib is required is PNG=ON) --- src/CMakeLists.txt | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92094bfb..42130e69 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 )