From be14a1a7b4c465a4559b79df158ce8d2ee4487b9 Mon Sep 17 00:00:00 2001
From: Dan Liew <daniel.liew@imperial.ac.uk>
Date: Tue, 25 Jul 2017 15:31:17 +0100
Subject: [TravisCI] Make sure when building with CMake that only the solvers
 requested get used.

---
 .travis/klee.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis/klee.sh b/.travis/klee.sh
index 19b9e47f..119fbb47 100755
--- a/.travis/klee.sh
+++ b/.travis/klee.sh
@@ -51,13 +51,13 @@ fi
 ###############################################################################
 # Handle setting up solver configure flags for KLEE
 ###############################################################################
-KLEE_Z3_CONFIGURE_OPTION=""
-KLEE_STP_CONFIGURE_OPTION=""
-KLEE_METASMT_CONFIGURE_OPTION=""
 SOLVER_LIST=$(echo "${SOLVERS}" | sed 's/:/ /')
 
 if [ "X${USE_CMAKE}" == "X1" ]; then
   # Set CMake configure options
+  KLEE_Z3_CONFIGURE_OPTION="-DENABLE_SOLVER_Z3=OFF"
+  KLEE_STP_CONFIGURE_OPTION="-DENABLE_SOLVER_STP=OFF"
+  KLEE_METASMT_CONFIGURE_OPTION="-DENABLE_SOLVER_METASMT=OFF"
   for solver in ${SOLVER_LIST}; do
     echo "Setting CMake configuration option for ${solver}"
     case ${solver} in
@@ -82,6 +82,9 @@ if [ "X${USE_CMAKE}" == "X1" ]; then
   done
   TCMALLOC_OPTION=$([ "${USE_TCMALLOC:-0}" == 1 ] && echo "-DENABLE_TCMALLOC=TRUE" || echo "-DENABLE_TCMALLOC=FALSE")
 else
+  KLEE_Z3_CONFIGURE_OPTION=""
+  KLEE_STP_CONFIGURE_OPTION=""
+  KLEE_METASMT_CONFIGURE_OPTION=""
   for solver in ${SOLVER_LIST}; do
     echo "Setting configuration option for ${solver}"
     case ${solver} in
-- 
cgit 1.4.1