Merge pull request #25 from nikolaseu/chore-add-appveyor

Add Windows CI (appveyor, using vcpkg for dependencies)

Author: nikolaseu

.travis.yml

@@ -14,7 +14,6 @@ before_install:
     - brew update && brew bundle
 
 script:
-    - mkdir build
     - cd build
     - $(brew --prefix qt)/bin/qmake ../NEUVision.pro
     - make

3rdparty/opencv.pri

@@ -2,15 +2,16 @@
 
 # Windows
 win32 {
-    OPENCV_INCLUDE_DIR = $$(THIRDPARTY)/Release/include
+    # using vcpkg, useful for CI (appveyor)
+    OPENCV_DIR = C:/Tools/vcpkg/installed/x64-windows
+    OPENCV_VER = 341
 
+    OPENCV_INCLUDE_DIR = $$OPENCV_DIR/include
     CONFIG(release, debug|release) {
-        OPENCV_LIB_DIR = $$(THIRDPARTY)/Release/x64/vc14/lib
+        OPENCV_LIB_DIR = $$OPENCV_DIR/lib
     } else {
-        OPENCV_LIB_DIR = $$(THIRDPARTY)/Debug/x64/vc14/lib
+        OPENCV_LIB_DIR = $$OPENCV_DIR/debug/lib
     }
-
-    OPENCV_VER = 330
 }
 
 # Linux

3rdparty/qtpropertybrowser.pri

@@ -4,3 +4,5 @@ else:unix: LIBS += -L$$Z3D_BUILD_DIR -lQtSolutionsPropertyBrowser
 
 INCLUDEPATH += $$PWD/qtpropertybrowser/src
 DEPENDPATH += $$PWD/qtpropertybrowser/src
+
+DEFINES += QT_QTPROPERTYBROWSER_IMPORT

NEUVision.pro

@@ -17,7 +17,5 @@ Z3DCameraViewer.depends = lib
 SUBDIRS  += Z3DScanner
 Z3DScanner.depends = lib
 
-!android:!macx{
-    SUBDIRS  += Z3DCloudViewer
-    Z3DCloudViewer.depends = lib
-}
+#SUBDIRS  += Z3DCloudViewer
+#Z3DCloudViewer.depends = lib

README.md

@@ -1,6 +1,7 @@
 # Structured Light based 3D scanner
 
 [![Build Status](https://travis-ci.com/nikolaseu/neuvision.svg?branch=master)](https://travis-ci.com/nikolaseu/neuvision)
+[![Build status](https://ci.appveyor.com/api/projects/status/q3vr5tbjbh3v8jh5/branch/master?svg=true)](https://ci.appveyor.com/project/nikolaseu/neuvision/branch/master)
 
 Engineering degree thesis/project for the title of "Ingeniero en Informatica", Universidad Nacional del Litoral (Santa Fe, Argentina).
 

appveyor.yml

@@ -0,0 +1,52 @@
+version: 0.1.0-{build}
+image:
+- Visual Studio 2015
+platform: x64
+configuration: Release
+pull_requests:
+  do_not_increment_build_number: true
+#init:
+#  # To get RDP details for the current build worker
+#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#on_finish:
+#  # If you need to investigate worker on build finish add $blockRdp = $true; to display Remote Desktop connection details and pause the build until a special “lock” file on VM desktop is deleted:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+environment:
+  APPVEYOR_SAVE_CACHE_ON_ERROR: true
+cache:
+- C:\Tools\vcpkg\installed\
+install:
+#- choco install OpenCV --params="'/Environment'"
+- vcpkg install opencv:x64-windows
+#- vcpkg install vtk:x64-windows
+#- vcpkg install pcl:x64-windows
+build_script:
+- dir "C:/Tools/vcpkg/installed/x64-windows"
+- dir "C:/Tools/vcpkg/installed/x64-windows/include"
+- dir "C:/Tools/vcpkg/installed/x64-windows/lib"
+- dir "C:/Tools/vcpkg/installed/x64-windows/bin"
+- cd build
+- call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
+- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
+- call "C:\Qt\5.10.1\msvc2015_64\bin\qmake.exe" ..\neuvision.pro -spec win32-msvc
+- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\nmake.exe"
+after_build:
+- cd %APPVEYOR_BUILD_FOLDER%/bin/release5
+- call "C:\Qt\5.10.1\msvc2015_64\bin\windeployqt.exe" -concurrent Z3DScanner.exe
+- cp "C:/Tools/vcpkg/installed/x64-windows/bin"/*.dll .
+artifacts:
+  # pushing entire folder as a zip archive
+  - path: bin/release5
+    name: NEUVision-Windows-x64-v$(appveyor_build_version)
+deploy:
+  release: NEUVision-Windows-x64-v$(appveyor_build_version)
+  description: 'Automatic snapshot release from CI'
+  provider: GitHub
+  auth_token:
+    secure: aHV+YRaW2BChwsCNWDuyIcIMS6WLL8Y/owvslumt0sXRrtbtPHHj3p7/7OdToJ5t
+  artifact: /.*\.zip/            # upload all zip packages to release assets
+  draft: true
+  prerelease: true
+  on:
+    branch: master               # release from master branch only
+#    appveyor_repo_tag: true      # deploy on tag push only

build/.gitignore

@@ -0,0 +1 @@
+*

lib/lib.pro

@@ -20,7 +20,5 @@ zcameracalibrator.depends = zcalibratedcamera zcameraacquisition zcameracalibrat
 SUBDIRS  += zstructuredlight
 zstructuredlight.depends = zcore zcalibratedcamera zcameraacquisition zcameracalibration zcameracalibrator
 
-!android:!macx{
-    SUBDIRS  += zpointcloud
-    zpointcloud.depends = zcalibratedcamera zcameraacquisition zcameracalibration
-}
+#SUBDIRS  += zpointcloud
+#zpointcloud.depends = zcalibratedcamera zcameraacquisition zcameracalibration

lib/zcameraacquisition/plugins/plugins.pro

@@ -8,19 +8,12 @@ unix:!android: {
     SUBDIRS += zlibgphoto2
 }
 
-win32: {
-    ## Windows build here
-    SUBDIRS  += zpylon
+## Uncomment the ones you want to build
+#SUBDIRS  += zpylon
+#SUBDIRS  += zavtvimba
+#SUBDIRS  += zflycapture2
+#SUBDIRS  += zlucam
+#SUBDIRS  += zniimaqdxgrab
+#SUBDIRS  += zpleoraebus
 
-    !contains(QMAKE_TARGET.arch, x86_64) {
-        ## Windows x86 (32bit) specific build here
-        SUBDIRS  += zavtvimba
-        SUBDIRS  += zflycapture2
-        SUBDIRS  += zlucam
-        SUBDIRS  += zniimaqdxgrab
-        SUBDIRS  += zpleoraebus
-    } else {
-        ## Windows x64 (64bit) specific build here
-        message('Building only x86_64 compatible camera acquisition plugins')
-    }
-}
+message('Configured for building camera acquisition plugins:' $$SUBDIRS)