From a279efc739f2c3947fe2b0457fddd08d1ebff16a Mon Sep 17 00:00:00 2001
From: Jeongseok Lee <jeoslee@amazon.com>
Date: Sun, 10 May 2020 22:32:09 -0700
Subject: [PATCH 1/2] Treat warnings as errors in CI builds

---
 .ci/script.sh  | 12 ++++++++++--
 CMakeLists.txt |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.ci/script.sh b/.ci/script.sh
index d243f0b..9c6ba5e 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -13,9 +13,17 @@ mkdir build
 cd build
 
 if [ $BUILD_NAME = TRUSTY_GCC_DEBUG ]; then
-  cmake "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DLLVM_DIR=${LLVM_DIR}" "-DCODECOV=ON" ..
+  cmake .. \
+    "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" \
+    "-CHIMERA_TREAT_WARNINGS_AS_ERRORS=ON" \
+    "-DLLVM_DIR=${LLVM_DIR}" \
+    "-DCODECOV=ON"
 else
-  cmake "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DLLVM_DIR=${LLVM_DIR}" "-DCODECOV=OFF" ..
+  cmake .. \
+    "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" \
+    "-CHIMERA_TREAT_WARNINGS_AS_ERRORS=ON" \
+    "-DLLVM_DIR=${LLVM_DIR}" \
+    "-DCODECOV=OFF"
 fi
 
 if [ "$OS_NAME" = "linux" ] && [ $(lsb_release -sc) = "bionic" ]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbf2104..c88ea81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,13 @@ set(CHIMERA_VERSION
   ${CHIMERA_MAJOR_VERSION}.${CHIMERA_MINOR_VERSION}.${CHIMERA_PATCH_VERSION}
 )
 
+# Compiler options
+option(CHIMERA_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
+if(CHIMERA_TREAT_WARNINGS_AS_ERRORS)
+  # Works for GCC and Clang
+  add_definitions(-Werror)
+endif()
+
 # Preset for code formatting
 include(ClangFormat)
 clang_format_setup()

From e61bb8cd0e29c1302497aa0b259d9927814a4a3e Mon Sep 17 00:00:00 2001
From: Jeongseok Lee <jeoslee@amazon.com>
Date: Sun, 10 May 2020 22:35:32 -0700
Subject: [PATCH 2/2] Fix syntax error

---
 .ci/script.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/script.sh b/.ci/script.sh
index 9c6ba5e..38fe81a 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -15,13 +15,13 @@ cd build
 if [ $BUILD_NAME = TRUSTY_GCC_DEBUG ]; then
   cmake .. \
     "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" \
-    "-CHIMERA_TREAT_WARNINGS_AS_ERRORS=ON" \
+    "-DCHIMERA_TREAT_WARNINGS_AS_ERRORS=ON" \
     "-DLLVM_DIR=${LLVM_DIR}" \
     "-DCODECOV=ON"
 else
   cmake .. \
     "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" \
-    "-CHIMERA_TREAT_WARNINGS_AS_ERRORS=ON" \
+    "-DCHIMERA_TREAT_WARNINGS_AS_ERRORS=ON" \
     "-DLLVM_DIR=${LLVM_DIR}" \
     "-DCODECOV=OFF"
 fi