#1273 Correction to r4699
This commit is contained in:
parent
720b94bb5e
commit
91bfda349d
@ -246,10 +246,15 @@ SET_TARGET_PROPERTIES( exiv2lib PROPERTIES
|
||||
OUTPUT_NAME exiv2
|
||||
)
|
||||
|
||||
string( TOLOWER "${CMAKE_SYSTEM_NAME}" SYSTEM_NAME )
|
||||
|
||||
IF ( UNIX )
|
||||
IF ( NOT CYGWIN AND NOT MINGW )
|
||||
SET (LINUX 1)
|
||||
ENDIF()
|
||||
IF ( SYSTEM_NAME EQUAL "freebsd" )
|
||||
SET (FREEBSD 1)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
if ( MSVC )
|
||||
@ -261,7 +266,7 @@ if ( MSVC )
|
||||
source_group("Header Files" FILES ${SSH_HDR} )
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
|
||||
else()
|
||||
if ( MINGW OR CYGWIN )
|
||||
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} )
|
||||
@ -305,7 +310,6 @@ IF (CYGWIN OR MINGW)
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} psapi ws2_32 )
|
||||
ENDIF(CYGWIN OR MINGW)
|
||||
|
||||
|
||||
INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
include(../CMake_msvc.txt)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user