From 90390bd8d18b9ca5f1ecf5ae4f705b0089f9ea8f Mon Sep 17 00:00:00 2001
From: Andrea Mattavelli <andreamattavelli@gmail.com>
Date: Fri, 28 Jul 2017 08:58:01 +0100
Subject: Modified Travis-CI script to compile STP with BOOST support

---
 .travis.yml    | 3 ++-
 .travis/stp.sh | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6034540..9c0ca814 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,12 +97,13 @@ addons:
     packages:
     - gcc-4.8
     - g++-4.8
+    - libboost-program-options-dev
     - libcap-dev
     - libedit-dev
     - libselinux1-dev
     - cmake
 
-cache: 
+cache:
   apt: true
   directories:
     - $HOME/Library/Caches/Homebrew
diff --git a/.travis/stp.sh b/.travis/stp.sh
index 6df59ebe..66e3418d 100755
--- a/.travis/stp.sh
+++ b/.travis/stp.sh
@@ -35,17 +35,14 @@ if [ "x${STP_VERSION}" != "x" ]; then
 
   # Determine STP build flags
   if [ "X${STP_VERSION}" = "Xmaster" ]; then
-    # 7e0b096ee79d59bb5c344b7dd4d51b5b8d226221 s/NO_BOOST/ONLY_SIMPLE/
     # 5e9ca6339a2b3b000aa7a90c18601fdcf1212fe1 Silently BUILD_SHARED_LIBS removed. STATICCOMPILE does something similar
     STP_CMAKE_FLAGS=( \
       "-DENABLE_PYTHON_INTERFACE:BOOL=OFF" \
-      "-DONLY_SIMPLE:BOOL=ON" \
       "-DSTATICCOMPILE:BOOL=ON" \
     )
   else
     STP_CMAKE_FLAGS=( \
       "-DENABLE_PYTHON_INTERFACE:BOOL=OFF" \
-      "-DNO_BOOST:BOOL=ON" \
       "-DBUILD_SHARED_LIBS:BOOL=OFF" \
     )
   fi
-- 
cgit 1.4.1


From 7a305a4275c6226f6dd4e103e8ab5b6b3be8e73c Mon Sep 17 00:00:00 2001
From: Andrea Mattavelli <andreamattavelli@gmail.com>
Date: Fri, 28 Jul 2017 08:59:04 +0100
Subject: Fixed script for STP in Travis-CI: Build now exits on errors

---
 .travis/stp.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis/stp.sh b/.travis/stp.sh
index 66e3418d..e8647839 100755
--- a/.travis/stp.sh
+++ b/.travis/stp.sh
@@ -68,4 +68,5 @@ fi
 if [ $? -ne 0 ]; then
   echo "Build error"
   cat "${STP_LOG}"
+  exit 1
 fi
-- 
cgit 1.4.1