diff --git a/CMakeLists.txt b/CMakeLists.txt index f864d55..6419a0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ SET(Boost_USE_STATIC_RUNTIME OFF) SET(Boost_FOUND FALSE) FIND_PACKAGE(Boost 1.46.0 REQUIRED COMPONENTS program_options) if ( Boost_FOUND ) + ADD_DEFINITIONS(${BOOST_DEFINITIONS} -DBOOST_ALL_NO_LIB) message(STATUS "Boost and boost_program_options found.") include_directories( ${Boost_INCLUDE_DIRS} ) SET(DGtalToolsContribLibDependencies ${DGtalToolsContribLibDependencies} diff --git a/appveyor.yml b/appveyor.yml index a421321..5d48b64 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,13 +48,26 @@ init: install: before_build: + # install zlib + - cmd: mkdir c:\zlib + - appveyor DownloadFile "https://github.com/madler/zlib/archive/v1.2.9.zip" -FileName zlib.zip + - 7z x zlib.zip -oC:\zlib + - cmd: cd C:\zlib + - cmd: mkdir C:\zlib-install + - cmd: mkdir C:\zlib-build + - cmd: cd C:\zlib-build + - cmd: dir C:\zlib + - cmake -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DCMAKE_INSTALL_PREFIX:PATH=c:\zlib-install C:\zlib\zlib-1.2.9 + - msbuild zlib.sln /m + - cmd: msbuild INSTALL.vcxproj + - git clone https://github.com/kerautret/libQGLViewer.git C:\projects\libqglviewer - cd C:\projects\libqglviewer\QGLViewer - qmake -t vclib QGLViewer.pro -spec win32-msvc2013 -o qglviewer.vcxproj - msbuild /m /p:Configuration=%CONFIGQGL% /p:Platform=%B_NAME% qglviewer.vcxproj - git clone -q --branch=master https://github.com/DGtal-team/DGtal.git C:\projects\dgtal - cd C:\projects\dgtal - - cmake -Wno-dev -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DWITH_QGLVIEWER:BOOL=ON -DWITH_QT5:BOOL=ON -DQGLVIEWER_INCLUDE_DIR=C:\projects\libqglviewer -DQGLVIEWER_LIBRARIES=C:\projects\libqglviewer\QGLViewer\QGLViewer2.lib -DBUILD_TESTING:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=FALSE -DBOOST_ROOT=%BOOST_ROOT% . + - cmake -Wno-dev -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DWITH_QGLVIEWER:BOOL=ON -DWITH_QT5:BOOL=ON -DQGLVIEWER_INCLUDE_DIR=C:\projects\libqglviewer -DQGLVIEWER_LIBRARIES=C:\projects\libqglviewer\QGLViewer\QGLViewer2.lib -DBUILD_TESTING:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=FALSE -DZLIB_LIBRARY=c:/zlib-install/lib/zlibd.lib -DZLIB_INCLUDE_DIR=c:/zlib-install/include/ -DBOOST_ROOT=%BOOST_ROOT% . - msbuild /m /p:Configuration=%CONFIG% /p:Platform=%B_NAME% DGtal.sln - cd %APPVEYOR_BUILD_FOLDER% - cmake -Wno-dev -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DDGtal_DIR=C:\projects\dgtal .