xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1041. Changes discussed with Daniel on Skype.

Browse Source
v0.27.3
Robin Mills 10 years ago
parent 314b142dc2
commit 85c6a7b109
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File

28
CMakeLists.txt
Unescape Escape View File

@ -54,8 +54,8 @@ OPTION( EXIV2_ENABLE_BUILD_SAMPLES "Build the unit tests"
OPTION( EXIV2_ENABLE_BUILD_PO "Build translations files" OFF ) OPTION( EXIV2_ENABLE_BUILD_PO "Build translations files" OFF )
OPTION( EXIV2_ENABLE_VIDEO "Build video support into library" OFF ) OPTION( EXIV2_ENABLE_VIDEO "Build video support into library" OFF )
OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF )
OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" ON ) OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" OFF )
OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" OFF )
IF (WIN32) IF (WIN32)
OPTION( EXIV2_ENABLE_WIN_UNICODE "Use Unicode paths (wstring) on Windows" OFF ) OPTION( EXIV2_ENABLE_WIN_UNICODE "Use Unicode paths (wstring) on Windows" OFF )
ENDIF() ENDIF()
@ -100,31 +100,23 @@ if( MSVC )
ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905) ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
set(E expat-2.1.0) set(E expat)
set(Z zlib-1.2.7) set(Z zlib)
set(C curl-7.39.0) set(C curl)
set(C libssh-0.5.5) set(S libssh)
# link dependent libraries # link dependent libraries
FIND_PACKAGE(EXPAT QUIET) FIND_PACKAGE(EXPAT QUIET)
if ( NOT EXPAT_LIBRARY ) if ( EXPAT_FOUND )
set(EXPAT_LIBRARY ${CMAKE_SOURCE_DIR}/../${E}/$(ConfigurationName)/expat) include_directories( ${EXPAT_INCLUDE_DIR} )
set(EXPAT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${E}/lib)
include_directories( ${EXPAT_INCLUDE_DIR} msvc64\\include src\\include)
endif() endif()
FIND_PACKAGE(CURL) FIND_PACKAGE(CURL QUIET)
if ( NOT CURL_FOUND ) if ( CURL_FOUND )
set(CURL_LIBRARY ${CMAKE_SOURCE_DIR}/../${C}/$(ConfigurationName)/curl)
set(CURL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${C})
include_directories( ${CURL_INCLUDE_DIR}) include_directories( ${CURL_INCLUDE_DIR})
endif() endif()
FIND_PACKAGE(ZLIB QUIET) FIND_PACKAGE(ZLIB QUIET)
if ( NOT ZLIB_FOUND )
set(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/../${Z}/$(ConfigurationName)/zlib)
set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${Z})
endif()
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIR})
if ( EXIV2_ENABLE_SHARED ) if ( EXIV2_ENABLE_SHARED )

Write Preview
Loading…
Cancel
Save