From 9cc1a5931c34535436a2fb82e51031121b3a53d1 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Thu, 22 Jan 2015 12:39:20 +0100
Subject: [PATCH] Make -Werror optional

---
 .travis/linux..script.sh      | 2 +-
 .travis/linux.win32.script.sh | 1 +
 .travis/linux.win64.script.sh | 1 +
 .travis/osx..script.sh        | 2 +-
 CMakeLists.txt                | 3 ++-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh
index d89b130db..c9de77d36 100644
--- a/.travis/linux..script.sh
+++ b/.travis/linux..script.sh
@@ -1 +1 @@
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_WERROR=ON ..
diff --git a/.travis/linux.win32.script.sh b/.travis/linux.win32.script.sh
index 3831a842f..b0743d295 100644
--- a/.travis/linux.win32.script.sh
+++ b/.travis/linux.win32.script.sh
@@ -1 +1,2 @@
+export CMAKE_OPTS="-DUSE_WERROR=ON"
 ../build_mingw32 || ../build_mingw32
diff --git a/.travis/linux.win64.script.sh b/.travis/linux.win64.script.sh
index 7c6c4f96a..ba79da8ca 100644
--- a/.travis/linux.win64.script.sh
+++ b/.travis/linux.win64.script.sh
@@ -1 +1,2 @@
+export CMAKE_OPTS="-DUSE_WERROR=ON"
 ../build_mingw64 || ../build_mingw64
diff --git a/.travis/osx..script.sh b/.travis/osx..script.sh
index d89b130db..d594e58f6 100644
--- a/.travis/osx..script.sh
+++ b/.travis/osx..script.sh
@@ -1 +1 @@
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. -DUSE_WERROR=OFF
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cb740777..a526df3df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,7 +358,8 @@ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CM
 
 # set compiler flags
 SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
-IF(NOT LMMS_BUILD_APPLE)
+OPTION(USE_WERROR "Add -werror to the build flags. Stops the build on warnings" OFF)
+IF(${USE_WERROR})
    SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
 ENDIF()