Patch #856 ยป exiv2Tests.patch
| src/CMakeLists.txt (working copy) | ||
|---|---|---|
| 256 | 256 |
## |
| 257 | 257 |
# copy zlib and expat dlls to output directory (TODO: rewrite for NMake) |
| 258 | 258 |
IF ( MSVC AND EXIV2_ENABLE_SHARED ) |
| 259 |
if (OUT_OF_SOURCE) |
|
| 260 |
ADD_CUSTOM_COMMAND( |
|
| 261 |
TARGET exiv2lib |
|
| 262 |
POST_BUILD |
|
| 263 |
COMMAND copy /y $(SolutionDir)..\\..\\${E}\\$(ConfigurationName)\\*.dll $(SolutionDir)\\bin\\${P_DIR}\\${T_DIR}\\$(ConfigurationName)
|
|
| 264 |
) |
|
| 265 |
ADD_CUSTOM_COMMAND( |
|
| 266 |
TARGET exiv2lib |
|
| 267 |
POST_BUILD |
|
| 268 |
COMMAND copy /y $(SolutionDir)..\\..\\${Z}\\$(ConfigurationName)\\*.dll $(SolutionDir)\\bin\\${P_DIR}\\${T_DIR}\\$(ConfigurationName)
|
|
| 269 |
) |
|
| 270 |
else() |
|
| 271 |
ADD_CUSTOM_COMMAND( |
|
| 272 |
TARGET exiv2lib |
|
| 273 |
POST_BUILD |
|
| 274 |
COMMAND copy /y $(SolutionDir)..\\${E}\\$(ConfigurationName)\\*.dll $(SolutionDir)\\bin\\${P_DIR}\\${T_DIR}\\$(ConfigurationName)
|
|
| 275 |
) |
|
| 276 |
ADD_CUSTOM_COMMAND( |
|
| 277 |
TARGET exiv2lib |
|
| 278 |
POST_BUILD |
|
| 279 |
COMMAND copy /y $(SolutionDir)..\\${Z}\\$(ConfigurationName)\\*.dll $(SolutionDir)\\bin\\${P_DIR}\\${T_DIR}\\$(ConfigurationName)
|
|
| 280 |
) |
|
| 281 |
endif() |
|
| 259 |
get_filename_component(EXPAT_LIBRARY_DIR ${EXPAT_LIBRARY} PATH)
|
|
| 260 |
string(REGEX REPLACE "/" "\\\\" EXPAT_LIBRARY_DIR ${EXPAT_LIBRARY_DIR})
|
|
| 261 |
get_filename_component(ZLIB_LIBRARY_DIR ${ZLIB_LIBRARY} PATH)
|
|
| 262 |
string(REGEX REPLACE "/" "\\\\" ZLIB_LIBRARY_DIR ${ZLIB_LIBRARY_DIR})
|
|
| 263 |
ADD_CUSTOM_COMMAND( |
|
| 264 |
TARGET exiv2lib |
|
| 265 |
POST_BUILD |
|
| 266 |
COMMAND copy /y ${EXPAT_LIBRARY_DIR}\\*.dll $(SolutionDir)\\bin\\${P_DIR}\\${T_DIR}\\$(ConfigurationName)
|
|
| 267 |
) |
|
| 268 |
ADD_CUSTOM_COMMAND( |
|
| 269 |
TARGET exiv2lib |
|
| 270 |
POST_BUILD |
|
| 271 |
COMMAND copy /y ${ZLIB_LIBRARY_DIR}\\*.dll $(SolutionDir)\\bin\\${P_DIR}\\${T_DIR}\\$(ConfigurationName)
|
|
| 272 |
) |
|
| 282 | 273 |
ENDIF() |
| 283 | 274 |
INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
|
| 284 | 275 | |
| samples/CMakeLists.txt (working copy) | ||
|---|---|---|
| 14 | 14 |
# link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.7/$(ConfigurationName))
|
| 15 | 15 |
endif() |
| 16 | 16 |
endif() |
| 17 |
include_directories("${CMAKE_SOURCE_DIR}/include")
|
|
| 18 |
|
|
| 17 | 19 | |
| 18 | 20 |
SET( SAMPLES addmoddel.cpp |
| 19 | 21 |
convert-test.cpp |
| CMakeLists.txt (working copy) | ||
|---|---|---|
| 72 | 72 |
|
| 73 | 73 |
# link dependent libraries |
| 74 | 74 |
if ( NOT EXPAT_LIBRARY ) |
| 75 |
if (OUT_OF_SOURCE) |
|
| 76 |
set(EXPAT_LIBRARY ../../../${E}/$(ConfigurationName)/expat)
|
|
| 77 |
set(EXPAT_INCLUDE_DIR ../${E}/lib)
|
|
| 78 |
else() |
|
| 79 |
set(EXPAT_LIBRARY ../../${E}/$(ConfigurationName)/expat)
|
|
| 80 |
set(EXPAT_INCLUDE_DIR ../${E}/lib)
|
|
| 81 |
endif() |
|
| 75 |
set(EXPAT_LIBRARY ${CMAKE_SOURCE_DIR}/../${E}/$(ConfigurationName)/expat)
|
|
| 76 |
set(EXPAT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${E}/lib)
|
|
| 82 | 77 |
include_directories( ${EXPAT_INCLUDE_DIR} msvc64\\include src\\include)
|
| 83 | 78 |
endif() |
| 84 | 79 |
|
| 85 | 80 |
FIND_PACKAGE(ZLIB QUIET) |
| 86 | 81 |
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() |
|
| 82 |
set(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/../${Z}/$(ConfigurationName)/zlib)
|
|
| 83 |
set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${Z})
|
|
| 94 | 84 |
endif() |
| 95 | 85 |
include_directories(${ZLIB_INCLUDE_DIR})
|
| 96 | 86 |
|