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

cmake work in progress

Browse Source
This commit is contained in:
Robin Mills 2012-06-10 06:24:39 +00:00
parent 6f769602ae
commit a7fecfde78
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -58,7 +58,7 @@ if( MSVC )
endif()
if ( NOT EXPAT_LIBRARY )
# link dependant libraries
# link dependent libraries
if (OUT_OF_SOURCE)
set(EXPAT_LIBRARY ../../../${E}/$(ConfigurationName)/expat)
set(ZLIB_LIBRARY ../../../${Z}/$(ConfigurationName)/zlib )
@ -70,7 +70,7 @@ if( MSVC )
set(EXPAT_INCLUDE_DIR ../${E}/lib )
set(ZLIB_INCLUDE_DIR ../${Z} )
endif()
include_directories( ${EXPAT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ../msvc64/include ../../msvc64/include $(SolutionDir)\\src\\include)
include_directories( ${EXPAT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} msvc64\\include src\\include)
endif()
if ( EXIV2_ENABLE_SHARED )

2
samples/CMakeLists.txt
View File

@ -8,7 +8,7 @@
if (MSVC)
include(../CMake_msvc.txt)
msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../msvc64/include )
# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../msvc64/include )
if ( NOT EXIV2_ENABLE_SHARED )
# link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.7/$(ConfigurationName))