From b4ef60ce936ac990e3b7cb4002d6aed070e13400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Mon, 12 May 2014 10:12:24 +0200 Subject: [PATCH] CMakelists.txt: update OSG Win dependences --- CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e92534f..5b9f187 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,12 +78,16 @@ elseif(MSVC) endif (CMAKE_CL_64) SET(OSG_CMAKE_ARGS - -DACTUAL_3RDPARTY_DIR:PATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR} -DBUILD_OSG_APPLICATIONS:BOOL=ON -DOSG_PLUGIN_SEARCH_INSTALL_DIR_FOR_PLUGINS:BOOL=OFF - -DFREETYPE_LIBRARY:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/lib/freetype243.lib - -DGDAL_INCLUDE_DIR:PATH= - -DGDAL_LIBRARY:FILEPATH= + -DACTUAL_3RDPARTY_DIR:PATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR} + -DCURL_INCLUDE_DIR:PATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\include + -DTIFF_INCLUDE_DIR:PATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\include + -DGDAL_INCLUDE_DIR:PATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\include + -DGDAL_LIBRARY:FILEPATH="${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\lib\gdal_i.lib + -DTIFF_LIBRARY:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\lib\libtiff.lib + -DCURL_LIBRARY:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\lib\libcurl_imp.lib + -DFREETYPE_LIBRARY:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}\lib\freetype.lib ) # for compatability with MSVC directory layout