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

Correction to r3968

Browse Source
This commit is contained in:
Robin Mills 2015-09-26 10:53:10 +00:00
parent d4ec76fa62
commit ea82638b9c
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/CMakeLists.txt
View File

@ -269,22 +269,10 @@ IF( EXIV2_ENABLE_PNG )
IF( ZLIB_FOUND )
IF( MSVC )
if ( EXIV2_ENABLE_SHARED )
set(ZLIB_OPTIM,${ZLIB_LIBRARIES})
set(ZLIB_DEBUG,${ZLIB_LIBRARIES}d)
else()
set(ZLIB_OPTIM,zlibstatic)
set(ZLIB_DEBUG,zlibstaticd.lib)
endif()
# 1041 - add .lib if necessary
if ( NOT "${ZLIB_OPTIM}" MATCHES "\.lib$") )
set(ZLIB_OPTIM,${ZLIB_OPTIM}.lib)
endif()
if ( NOT "${ZLIB_DEBUG}" MATCHES "\.lib$") )
set(ZLIB_DEBUG,${ZLIB_DEBUG}.lib)
endif()
TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_OPTIM} debug ${ZLIB_DEBUG} )
TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib )
else()
TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib )
endif()
ELSE()
TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} )
ENDIF()