From 18e9a4b0985c7011edf3800c76108dc6df7092e5 Mon Sep 17 00:00:00 2001
From: Rudolf Weeber <weeber@icp.uni-stuttgart.de>
Date: Fri, 14 Dec 2018 15:16:00 +0100
Subject: [PATCH 1/2] CMake: Default with_scafacos = off, since it requries
 ELECTROSTATICS

---
 CMakeLists.txt               | 2 +-
 maintainer/CI/build_cmake.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9626b9fbed9..a81ca2a1f9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ option(WITH_GSL "Build with GSL support" ON)
 option(WITH_CUDA   "Build with GPU support"  ON)
 option(WITH_HDF5   "Build with HDF5 support" ON)
 option(WITH_TESTS  "Enable tests"            ON)
-option(WITH_SCAFACOS "Build with Scafacos support" ON)
+option(WITH_SCAFACOS "Build with Scafacos support" OFF)
 option(WITH_VALGRIND_INSTRUMENTATION "Build with valgrind instrumentation markers" OFF)
 if( CMAKE_VERSION VERSION_GREATER 3.5.2 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
   option(WITH_CLANG_TIDY "Run Clang-Tidy during compilation" OFF)
diff --git a/maintainer/CI/build_cmake.sh b/maintainer/CI/build_cmake.sh
index d2acbe0177e..5cf339b0c38 100755
--- a/maintainer/CI/build_cmake.sh
+++ b/maintainer/CI/build_cmake.sh
@@ -84,7 +84,7 @@ if [[ ! -z ${with_coverage+x} ]]; then
   bash <(curl -s https://codecov.io/env) &> /dev/null;
 fi
 
-cmake_params="-DCMAKE_BUILD_TYPE=$build_type -DPYTHON_EXECUTABLE=$(which python$python_version) -DWARNINGS_ARE_ERRORS=ON -DTEST_NP:INT=$check_procs $cmake_params"
+cmake_params="-DCMAKE_BUILD_TYPE=$build_type -DPYTHON_EXECUTABLE=$(which python$python_version) -DWARNINGS_ARE_ERRORS=ON -DTEST_NP:INT=$check_procs $cmake_params -dWITH_SCAFACOS=on"
 cmake_params="$cmake_params -DCMAKE_CXX_FLAGS=$cxx_flags"
 cmake_params="$cmake_params -DCMAKE_INSTALL_PREFIX=/tmp/espresso-unit-tests"
 if $with_ccache; then

From 86e7b0a1f749b159635cc858755364835aac5fd1 Mon Sep 17 00:00:00 2001
From: Florian Weik <fweik@icp.uni-stuttgart.de>
Date: Mon, 17 Dec 2018 13:38:22 +0100
Subject: [PATCH 2/2] maintainer: Typo

---
 maintainer/CI/build_cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainer/CI/build_cmake.sh b/maintainer/CI/build_cmake.sh
index 5cf339b0c38..3726bf30ccb 100755
--- a/maintainer/CI/build_cmake.sh
+++ b/maintainer/CI/build_cmake.sh
@@ -84,7 +84,7 @@ if [[ ! -z ${with_coverage+x} ]]; then
   bash <(curl -s https://codecov.io/env) &> /dev/null;
 fi
 
-cmake_params="-DCMAKE_BUILD_TYPE=$build_type -DPYTHON_EXECUTABLE=$(which python$python_version) -DWARNINGS_ARE_ERRORS=ON -DTEST_NP:INT=$check_procs $cmake_params -dWITH_SCAFACOS=on"
+cmake_params="-DCMAKE_BUILD_TYPE=$build_type -DPYTHON_EXECUTABLE=$(which python$python_version) -DWARNINGS_ARE_ERRORS=ON -DTEST_NP:INT=$check_procs $cmake_params -DWITH_SCAFACOS=ON"
 cmake_params="$cmake_params -DCMAKE_CXX_FLAGS=$cxx_flags"
 cmake_params="$cmake_params -DCMAKE_INSTALL_PREFIX=/tmp/espresso-unit-tests"
 if $with_ccache; then