* Add presets for Spinnaker 1.15.x (pull #553)

.appveyor.yml

@@ -13,6 +13,8 @@ environment:
       OS: windows-x86
     - PROJ: "flycapture"
       OS: windows-x86
+    - PROJ: "spinnaker"
+      OS: windows-x86
     - PROJ: "libdc1394"
       OS: windows-x86
     - PROJ: "libfreenect"
@@ -56,6 +58,8 @@ environment:
       OS: windows-x86_64
     - PROJ: "flycapture"
       OS: windows-x86_64
+    - PROJ: "spinnaker"
+      OS: windows-x86_64
     - PROJ: "libdc1394"
       OS: windows-x86_64
     - PROJ: "libfreenect"

.travis.yml

@@ -600,6 +600,10 @@ matrix:
         env: PROJ=flycapture OS=linux-x86_64
         install: true
         script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=spinnaker OS=linux-x86_64
+        install: true
+        script: ./ci/install-travis.sh
       - os: linux
         env: PROJ=libdc1394 OS=linux-x86_64
         install: true

README.md

@@ -109,6 +109,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * OpenCV 3.4.3  https://opencv.org/releases.html
  * FFmpeg 4.0.x  http://ffmpeg.org/download.html
  * FlyCapture 2.11.x  http://www.ptgrey.com/flycapture-sdk
+ * Spinnaker 1.15.x https://www.ptgrey.com/spinnaker-sdk
  * libdc1394 2.1.x or 2.2.x  http://sourceforge.net/projects/libdc1394/files/
  * libfreenect 0.5.3  https://github.com/OpenKinect/libfreenect
  * libfreenect2 0.2.0  https://github.com/OpenKinect/libfreenect2

ci/install-travis.sh

@@ -81,6 +81,17 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ an
         docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -R $HOME/build/include/* /usr/include; cp -R $HOME/build/lib/* /usr/lib" 
     fi 
   fi 
+  if [ "$PROJ" == "spinnaker" ]; then
+    if [ "$OS" == "linux-x86_64" ]; then
+        if [[ $(find $HOME/downloads/spinnaker_local_v.1.15.0.63.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
+          echo "Found spinnaker in cache and size seems ok"
+        else
+          echo "Downloading flycap64 as not found in cache or too small"
+          python $TRAVIS_BUILD_DIR/ci/gDownload.py 1IYtvqzpNHJgZK-TPztW_WDYuDEyo56D_ $HOME/downloads/spinnaker_local_v.1.15.0.63.tar.gz
+        fi
+        docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "tar xvf $HOME/downloads/spinnaker_local_v.1.15.0.63.tar.gz -C /"
+    fi
+  fi
   if [[ "$PROJ" == "mkl" ]] && [[ "$OS" =~ linux ]]; then
          #don't put in download dir as will be cached and we can use direct url instead
          curl -L http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13005/l_mkl_2018.3.222.tgz -o $HOME/mkl.tgz

ci/install-windows.sh

@@ -75,6 +75,30 @@ if [ "$PROJ" == "flycapture" ]; then
        echo "Finished flycapture install"
 fi
 
+if [ "$PROJ" == "spinnaker" ]; then
+       echo Flycapture install
+       if [ "$OS" == "windows-x86_64" ]; then
+           if [[ $(find /c/Downloads/spinnaker.zip -type f -size +1000000c 2>/dev/null) ]]; then
+             echo "Found spinnaker in cache and size seems ok"
+           else
+             echo "Downloading spinnaker.zip to cache as not found"
+             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1b5vduBfsK44cJdwzMaR_f1kkmQxhsO7C /c/Downloads/spinnaker.zip
+           fi
+           unzip /c/Downloads/spinnaker.zip
+           mv Point\ Grey\ Research /c/Program\ Files
+       elif [ "$OS" == "windows-x86" ]; then
+           if [[ $(find /c/Downloads/spinnaker.zip -type f -size +1000000c 2>/dev/null) ]]; then
+             echo "Found spinnaker in cache and size seems ok"
+           else
+             echo "Downloading spinnaker.zip to cache as not found"
+             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1b5vduBfsK44cJdwzMaR_f1kkmQxhsO7C /c/Downloads/spinnaker.zip
+           fi
+           unzip /c/Downloads/spinnaker.zip
+           mv Point\ Grey\ Research /c/Program\ Files
+       fi
+       echo "Finished spinnaker install"
+fi
+
 if [ "$PROJ" == "mkl" ]; then
        echo Installing mkl 
        curl -L  -o mkl.exe "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13037/w_mkl_2018.3.210.exe"

platform/pom.xml

@@ -18,6 +18,7 @@
     <module>../opencv/platform</module>
     <module>../ffmpeg/platform</module>
     <module>../flycapture/platform</module>
+    <module>../spinnaker/platform</module>
     <module>../libdc1394/platform</module>
     <module>../libfreenect/platform</module>
     <module>../libfreenect2/platform</module>
@@ -73,6 +74,11 @@
       <artifactId>flycapture-platform</artifactId>
       <version>2.11.3.121-${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.bytedeco.javacpp-presets</groupId>
+      <artifactId>spinnaker-platform</artifactId>
+      <version>1.15.0.63-${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>libdc1394-platform</artifactId>

pom.xml

@@ -506,6 +506,7 @@
         <module>opencv</module>
         <module>ffmpeg</module>
         <module>flycapture</module>
+        <module>spinnaker</module>
         <module>libdc1394</module>
         <module>libfreenect</module>
         <module>libfreenect2</module>
@@ -1143,6 +1144,7 @@
         <module>opencv</module>
         <module>ffmpeg</module>
         <module>flycapture</module>
+        <module>spinnaker</module>
         <module>libdc1394</module>
         <module>libfreenect</module>
         <module>libfreenect2</module>
@@ -1266,6 +1268,7 @@
         <module>opencv</module>
         <module>ffmpeg</module>
         <module>flycapture</module>
+        <module>spinnaker</module>
         <module>libdc1394</module>
         <module>libfreenect</module>
         <module>librealsense</module>
@@ -1318,6 +1321,7 @@
         <module>opencv</module>
         <module>ffmpeg</module>
         <module>flycapture</module>
+        <module>spinnaker</module>
         <module>libdc1394</module>
         <module>libfreenect</module>
         <module>libfreenect2</module>