diff --git a/Makefile b/Makefile
index 2510e91b5..053d48208 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,10 @@ ifdef PROFILE
 MY_CMAKE_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
 endif
 
+ifdef BOOST_NO_SYSTEM_PATHS
+MY_CMAKE_FLAGS += -DBoost_NO_SYSTEM_PATHS:BOOL=TRUE
+endif
+
 ifneq (${MYCC},)
 MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER:STRING=${MYCC}
 endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3dcf2c704..897917fac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,9 +49,9 @@ if (NOT CMAKE_COMPILER_IS_CLANG)
     endif ()
 endif ()
 
-## turn on more detailed warnings and consider warnings as errors
+## turn on more detailed warnings
 if (NOT MSVC)
-    add_definitions ("-Wall -Werror")
+    add_definitions ("-Wall")
 endif ()
 
 ## disable RTTI