Merge pull request #1106 from kerautret/QGLviewerMS

DGtal on MS Windows with QGLViewer activated

ChangeLog.md

@@ -14,6 +14,10 @@
  'cl' compiler. (David Coeurjolly, Jérémy Levallois,
  [#1074](https:/DGtal-team/DGtal/pull/1074))
 
+ - DGtal with QGLViewer option activated now compiles on Microsoft Windows,
+ Visual Studio (only VS14 or above). (Bertrand Kerautret,
+ [#1106](https:/DGtal-team/DGtal/pull/1106))
+
 - *Base Package*
  - Traits class for containers in order to probe their category at
  compile time. (Jacques-Olivier Lachaud,

appveyor.yml

@@ -4,14 +4,20 @@ environment:
  matrix:
  - VS_GEN: Visual Studio 14 2015
  CONFIG: RelWithDebInfo
+ CONFIGQGL: Release
+
  B_NAME: Win32
- - VS_GEN: Visual Studio 14 2015 Win64
- CONFIG: Release
- B_NAME: Win64
+ QTDIR: C:\Qt\5.4\msvc2013_opengl 
+ # - VS_GEN: Visual Studio 14 2015 Win64
+ # CONFIG: Release
+ # B_NAME: Win64
+
+
 
 matrix:
  fast_finish: true
 
+
 # Operating system (build VM template)
 os: Visual Studio 2015
 branches:
@@ -29,16 +35,20 @@ init:
  - set
  - msbuild /version
  - cmake --version
+ - set PATH=%QTDIR%\bin;%PATH%
 
-# check nmake ?
-#- call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-#- cl
 
 # scripts that run after cloning repository
 install:
 
 before_build:
- - cmake -Wno-dev -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DBUILD_TESTING:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=FALSE -DBOOST_ROOT=C:\Libraries\boost .
+#install QGLViewer:
+ - git clone https:/kerautret/libQGLViewer.git
+ - cd C:\projects\dgtal\libqglviewer\QGLViewer
+ - qmake -t vclib QGLViewer.pro -spec win32-msvc2013 -o qglviewer.vcxproj
+ - msbuild /m /p:Configuration=%CONFIGQGL% /p:Platform=%B_NAME% qglviewer.vcxproj 
+ - cd C:\projects\dgtal
+ - cmake -Wno-dev -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DWITH_QGLVIEWER:BOOL=ON -DQGLVIEWER_INCLUDE_DIR=C:\projects\dgtal\libQGLViewer -DQGLVIEWER_LIBRARIES=C:\projects\dgtal\libQGLViewer\QGLViewer\QGLViewer2.lib -DWITH_QT5:BOOL=ON -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=FALSE -DBOOST_ROOT=C:\Libraries\boost .
 
 # - cmake -Wno-dev -G"%VS_GEN%" -DCMAKE_BUILD_TYPE=%CONFIG% -DGDCM_BUILD_TESTING:BOOL=ON -DGDCM_BUILD_APPLICATIONS:BOOL=ON -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DGDCM_ALLOW_INSOURCE_BUILD:BOOL=ON -DBUILDNAME:STRING=%COMPUTERNAME%-%B_NAME% -DGDCM_WRAP_CSHARP:BOOL=ON -DGDCM_WRAP_JAVA:BOOL=ON -DGDCM_WRAP_PYTHON:BOOL=ON -DGDCM_USE_PVRG:BOOL=ON .