From be2aff92d5a8940939278f2de551f6bdef6f0725 Mon Sep 17 00:00:00 2001
From: Daniel Weindl <daniel.weindl@helmholtz-muenchen.de>
Date: Mon, 7 Feb 2022 21:40:00 +0100
Subject: [PATCH 1/3] cmake: Remove stray set(ENABLE_SWIG)

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ae3b9d90d..af03d02887 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     endif()
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(ENABLE_SWIG ON)
 
 # Compiler flags
 include(CheckCXXCompilerFlag)

From 774f2df754ac77ef2ca050461907746e1a385bd4 Mon Sep 17 00:00:00 2001
From: Daniel Weindl <daniel.weindl@helmholtz-muenchen.de>
Date: Mon, 7 Feb 2022 21:54:19 +0100
Subject: [PATCH 2/3] cmake: Add AMICI_CXX_OPTIONS variable for
 libamici-specific compiler options

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af03d02887..8bcbf8b93e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,8 @@ if(ENABLE_HDF5)
 endif()
 
 add_library(${PROJECT_NAME} ${AMICI_SRC_LIST})
+set(AMICI_CXX_OPTIONS "" CACHE STRING "C++ options for libamici (semicolon-separated)")
+target_compile_options(${PROJECT_NAME} PRIVATE "${AMICI_CXX_OPTIONS}")
 add_dependencies(${PROJECT_NAME} version)
 file(GLOB PUBLIC_HEADERS include/amici/*.h)
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")

From 13cc764b23631136b9911effa808ff13bca6d2b1 Mon Sep 17 00:00:00 2001
From: Daniel Weindl <daniel.weindl@helmholtz-muenchen.de>
Date: Mon, 7 Feb 2022 21:56:07 +0100
Subject: [PATCH 3/3] Use -Werror only for AMICI_CXX_OPTIONS, not
 CMAKE_CXX_FLAGS

Closes #1661
---
 scripts/buildAmici.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/buildAmici.sh b/scripts/buildAmici.sh
index 735e05fd3b..2d40d3cb08 100755
--- a/scripts/buildAmici.sh
+++ b/scripts/buildAmici.sh
@@ -23,7 +23,7 @@ else
 fi
 
 ${cmake} \
-  -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror" \
+  -DAMICI_CXX_OPTIONS="-Wall;-Wextra;-Werror" \
   -DCMAKE_BUILD_TYPE=$build_type \
   -DPython3_EXECUTABLE="$(command -v python3)" ..