From 68afd91c068f25acc193154267634d2be1f32ca1 Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 08:48:02 +0100
Subject: [PATCH 1/8] add cond with EIGEN

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5085d7b..183d54bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,8 +61,8 @@ before_install:
   # Manual boost install since linking fails with libboost-program-options1.46-dev and g++48
 
 before_script:
-  - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false"
-  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_ITK=false"; fi
+  - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true"
+  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_ITK=false -DWITH_EIGEN=true"; fi
   - ccache -V && ccache --show-stats && ccache --zero-stats
   - 'echo "using gcc : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'
   - 'echo "using clang : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam'

From 1e2491213b406c7bd91f82264f64ebbbda523280 Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 08:59:12 +0100
Subject: [PATCH 2/8] eigen travis install

---
 .travis.yml              |  5 +++--
 .travis/install_eigen.sh | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100755 .travis/install_eigen.sh

diff --git a/.travis.yml b/.travis.yml
index 183d54bf..c56c6ab5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,8 +57,9 @@ before_install:
   - env
   - export SRC_DIR="`pwd`"
   - if [ $CXX == "g++" ]; then export CXX="g++-4.8"  CC="gcc-4.8"  CCOMPILER="gcc-4.8" CXXCOMPILER="g++-4.8"; fi
+  - source .travis/install_eigen.sh  ; cd $TRAVIS_BUILD_DIR;
 
-  # Manual boost install since linking fails with libboost-program-options1.46-dev and g++48
+# Manual boost install since linking fails with libboost-program-options1.46-dev and g++48
 
 before_script:
   - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true"
@@ -72,7 +73,7 @@ before_script:
   - cmake . $DGTALTYPE -DCMAKE_CXX_COMPILER=$CXXCOMPILER -DCMAKE_C_COMPILER=$CCOMPILER 
   - make
   - cd ..
-  - if [ $DOC == "true" ]; then .travis/install_doxygen.sh;  BTYPE="-DDOXYGEN_EXECUTABLE=$HOME/doxygen/doxygen-1.8.10/bin/doxygen -DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true  -DWITH_GMP=true";  fi
+  - if [ $DOC == "true" ]; then .travis/install_doxygen.sh;  BTYPE="-DDOXYGEN_EXECUTABLE=$HOME/doxygen/doxygen-1.8.10/bin/doxygen -DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true  -DWITH_GMP=true -DWITH_EIGEN=true";  fi
   - if [ $DOC == "true" ]; then wget http://dgtal.org/doc/tags/DGtal-tagfile --no-check-certificate ;fi
 
 
diff --git a/.travis/install_eigen.sh b/.travis/install_eigen.sh
new file mode 100755
index 00000000..f2c7ae05
--- /dev/null
+++ b/.travis/install_eigen.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+
+#
+# Local install of Eigen on linux system
+#
+
+export EIGEN_ROOT="/usr/local/"
+
+if [ $TRAVIS_OS_NAME == linux ];
+then
+    cd deps
+    wget http://bitbucket.org/eigen/eigen/get/3.2.10.tar.bz2
+
+    bunzip2 3.2.10.tar.bz2
+    tar xvf 3.2.10.tar
+
+    cd eigen-eigen-b9cd8366d4e8
+    mkdir build ; cd build
+
+    cmake .. -DCMAKE_INSTALL_PREFIX="${SRC_DIR}/deps/local"
+    make && make install && cd ${SRC_DIR} && export EIGEN_ROOT="$SRC_DIR/deps/local"
+
+fi

From 8d8e8382c66e13f5fdbe00bdb28fc721a194d56d Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 09:05:20 +0100
Subject: [PATCH 3/8] path eigen

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c56c6ab5..5f213483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,8 +62,8 @@ before_install:
 # Manual boost install since linking fails with libboost-program-options1.46-dev and g++48
 
 before_script:
-  - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true"
-  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_ITK=false -DWITH_EIGEN=true"; fi
+  - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"
+  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
   - ccache -V && ccache --show-stats && ccache --zero-stats
   - 'echo "using gcc : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'
   - 'echo "using clang : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam'

From e8d2abbdc0d574334b6e65ea2c64d548ca82aedf Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 09:25:47 +0100
Subject: [PATCH 4/8] add macos config

---
 .travis.yml                   |  6 ++++++
 .travis/install_deps_macos.sh | 14 ++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 .travis/install_deps_macos.sh

diff --git a/.travis.yml b/.travis.yml
index 5f213483..b23929d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ sudo: false
 
 os:
   - linux
+  - osx
 
 compiler:
   - gcc
@@ -28,6 +29,8 @@ matrix:
     - compiler: gcc
       os: linux
       env: CONFIG="DOCUMENTATION"
+    - os: osx
+      compiler: gcc
 
 addons:
   apt:
@@ -49,6 +52,9 @@ addons:
     - libboost-program-options-dev
     - libboost-system-dev
 
+before_script:
+  - if [ $TRAVIS_OS_NAME == linux ]; then echo "All done.";   fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then source .travis/install_deps_macos.sh; fi
 
 before_install:
   - DOC="false"; BTYPE=""
diff --git a/.travis/install_deps_macos.sh b/.travis/install_deps_macos.sh
new file mode 100644
index 00000000..6310f0fc
--- /dev/null
+++ b/.travis/install_deps_macos.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+#
+# Note: gmp and boost already installed
+#
+brew update
+#brew install qt5 doxygen homebrew/science/hdf5 graphviz graphicsmagick fftw eigen
+brew install qt5 graphicsmagick fftw eigen
+# Explicit install of libqglviewer
+brew install http://liris.cnrs.fr/david.coeurjolly/misc/libqglviewer.rb
+
+## Temporary HDF5 build issue
+export BTYPE="$BTYPE -DWITH_HDF5=false" && echo "Disabling HDF5 on MacOS";
+export BTYPE="$BTYPE -DWITH_QT5=true -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)" && echo "Forcing Qt5 on MacOS";

From 5318b919d3080ad667ec443429712b20f718c06c Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 09:57:02 +0100
Subject: [PATCH 5/8] add macos config edit

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b23929d7..e99d6a84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
 language: cpp
 dist: trusty
-
-
-
 sudo: false
 
 os:
@@ -71,8 +68,7 @@ before_script:
   - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"
   - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
   - ccache -V && ccache --show-stats && ccache --zero-stats
-  - 'echo "using gcc : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'
-  - 'echo "using clang : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
+  - if [ $TRAVIS_OS_NAME == linux ]; then echo "All done."; 'echo "using gcc : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'; 'echo "using clang : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam' fi
   - cd $SRC_DIR
   - git clone --depth=1 git://github.com/DGtal-team/DGtal.git
   - cd DGtal

From c41645e8b411ba721325f074d657e35e6e73c189 Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 10:04:05 +0100
Subject: [PATCH 6/8] travis reload

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e99d6a84..fa714bd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ compiler:
 
 cache: apt
 
-
 env:
   - CONFIG="Debug,QGLVIEWER"
   - CONFIG="Debug"

From 142529ca2c973a2230cb1cd122a5b7a9fc9ac80d Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 10:37:36 +0100
Subject: [PATCH 7/8] travis again

travis again

travis again

travis again

travis again

travis again

travis again

travis again

travis again

travis again
---
 .travis.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa714bd9..4377b417 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ compiler:
 
 cache: apt
 
+
 env:
   - CONFIG="Debug,QGLVIEWER"
   - CONFIG="Debug"
@@ -48,9 +49,6 @@ addons:
     - libboost-program-options-dev
     - libboost-system-dev
 
-before_script:
-  - if [ $TRAVIS_OS_NAME == linux ]; then echo "All done.";   fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then source .travis/install_deps_macos.sh; fi
 
 before_install:
   - DOC="false"; BTYPE=""
@@ -64,10 +62,10 @@ before_install:
 # Manual boost install since linking fails with libboost-program-options1.46-dev and g++48
 
 before_script:
+  - if [ $TRAVIS_OS_NAME == linux ]; then echo "All done.";   fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then source .travis/install_deps_macos.sh; fi
   - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"
-  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
-  - ccache -V && ccache --show-stats && ccache --zero-stats
-  - if [ $TRAVIS_OS_NAME == linux ]; then echo "All done."; 'echo "using gcc : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'; 'echo "using clang : : ccache $CXX : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam' fi
+  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_QT5=true -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
   - cd $SRC_DIR
   - git clone --depth=1 git://github.com/DGtal-team/DGtal.git
   - cd DGtal

From 6a3d3867c9ef0d07cff646bce1bfc117b777dd9d Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lorraine.fr>
Date: Sat, 24 Mar 2018 11:07:26 +0100
Subject: [PATCH 8/8] git qt5 on osx

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4377b417..5c27c161 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,8 @@ before_script:
   - if [ $TRAVIS_OS_NAME == linux ]; then echo "All done.";   fi
   - if [ $TRAVIS_OS_NAME == osx ]; then source .travis/install_deps_macos.sh; fi
   - DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=false -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"
-  - if [ $CONFIG == "Debug,QGLVIEWER" ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_QT5=true -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
+  - if [ $CONFIG == "Debug,QGLVIEWER" AND  $TRAVIS_OS_NAME == osx  ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true -DWITH_QT5=true -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
+  - if [ $CONFIG == "Debug,QGLVIEWER" AND  $TRAVIS_OS_NAME == linux  ]; then export DGTALTYPE="-DBUILD_EXAMPLES=OFF -DDGTAL_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_QGLVIEWER=true  -DWITH_ITK=false -DWITH_EIGEN=true -DEIGEN3_INCLUDE_DIR='$EIGEN_ROOT/include/eigen3'"; fi
   - cd $SRC_DIR
   - git clone --depth=1 git://github.com/DGtal-team/DGtal.git
   - cd DGtal