Patch #853 ยป exiv2FlexZlib.patch
| CMakeLists.txt (working copy) | ||
|---|---|---|
| 70 | 70 |
set(OUT_OF_SOURCE 1) |
| 71 | 71 |
endif() |
| 72 | 72 |
|
| 73 |
# link dependent libraries |
|
| 73 | 74 |
if ( NOT EXPAT_LIBRARY ) |
| 74 |
# link dependent libraries |
|
| 75 | 75 |
if (OUT_OF_SOURCE) |
| 76 | 76 |
set(EXPAT_LIBRARY ../../../${E}/$(ConfigurationName)/expat)
|
| 77 |
set(ZLIB_LIBRARY ../../../${Z}/$(ConfigurationName)/zlib )
|
|
| 78 |
set(EXPAT_INCLUDE_DIR ../${E}/lib )
|
|
| 79 |
set(ZLIB_INCLUDE_DIR ../${Z} )
|
|
| 77 |
set(EXPAT_INCLUDE_DIR ../${E}/lib)
|
|
| 80 | 78 |
else() |
| 81 | 79 |
set(EXPAT_LIBRARY ../../${E}/$(ConfigurationName)/expat)
|
| 82 |
set(ZLIB_LIBRARY ../../${Z}/$(ConfigurationName)/zlib)
|
|
| 83 |
set(EXPAT_INCLUDE_DIR ../${E}/lib )
|
|
| 84 |
set(ZLIB_INCLUDE_DIR ../${Z} )
|
|
| 80 |
set(EXPAT_INCLUDE_DIR ../${E}/lib)
|
|
| 85 | 81 |
endif() |
| 86 |
include_directories( ${EXPAT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} msvc64\\include src\\include)
|
|
| 82 |
include_directories( ${EXPAT_INCLUDE_DIR} msvc64\\include src\\include)
|
|
| 87 | 83 |
endif() |
| 88 | 84 |
|
| 85 |
FIND_PACKAGE(ZLIB QUIET) |
|
| 86 |
if ( NOT ZLIB_FOUND ) |
|
| 87 |
if (OUT_OF_SOURCE) |
|
| 88 |
set(ZLIB_LIBRARY ../../../${Z}/$(ConfigurationName)/zlib )
|
|
| 89 |
set(ZLIB_INCLUDE_DIR ../${Z})
|
|
| 90 |
else() |
|
| 91 |
set(ZLIB_LIBRARY ../../${Z}/$(ConfigurationName)/zlib)
|
|
| 92 |
set(ZLIB_INCLUDE_DIR ../${Z})
|
|
| 93 |
endif() |
|
| 94 |
endif() |
|
| 95 |
include_directories(${ZLIB_INCLUDE_DIR})
|
|
| 96 |
|
|
| 89 | 97 |
if ( EXIV2_ENABLE_SHARED ) |
| 90 | 98 |
add_library(${E} SHARED IMPORTED)
|
| 91 | 99 |
add_library(${Z} SHARED IMPORTED)
|