From 71db14bad4e9117ec554698a4d870a34fca9cce7 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Fri, 3 Mar 2017 08:02:49 -0500
Subject: [PATCH] Tidy up build settings

---
 CHANGELOG.md   | 2 ++
 CMakeLists.txt | 4 ++--
 Jamroot        | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8eb23ba3..34775a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 1.0.0-b31
 
+* Tidy up build settings
+
 WebSocket
 
 * Move the handler, don't copy it
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61a243c0..066540b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
 if (MSVC)
     # /wd4244 /wd4127
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /MP /W4 /wd4100 /bigobj /D _WIN32_WINNT=0x0601 /D _SCL_SECURE_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100 /wd4244 /wd4251 /MP /W4 /bigobj /D BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 /D _WIN32_WINNT=0x0601 /D _SCL_SECURE_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
     set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
     set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GL /MT")
     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi /Ot /MT")
@@ -34,7 +34,7 @@ else()
     find_package(Threads)
 
     set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wpedantic -Wno-unused-parameter")
+      "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wpedantic -Wno-unused-parameter -DBOOST_COROUTINES_NO_DEPRECATION_WARNING=1")
 endif()
 
 add_definitions ("-DBOOST_COROUTINES_NO_DEPRECATION_WARNING")
diff --git a/Jamroot b/Jamroot
index 54330523..277100ab 100644
--- a/Jamroot
+++ b/Jamroot
@@ -93,19 +93,20 @@ project beast
     <library>/boost/filesystem//boost_filesystem
     <library>/boost/program_options//boost_program_options
     <define>BOOST_ALL_NO_LIB=1
+    <define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
     <threading>multi
     <runtime-link>shared
     <debug-symbols>on
     <toolset>gcc:<cxxflags>-std=c++11
     <toolset>gcc:<cxxflags>-Wno-unused-parameter
+    <toolset>gcc:<cxxflags>-Wno-unused-variable # Temporary until we can figure out -isystem
     <toolset>clang:<cxxflags>-std=c++11
     <toolset>clang:<cxxflags>-Wno-unused-parameter
-    <toolset>gcc:<cxxflags>-Wno-unused-variable   # Temporary until we can figure out -isystem
     <toolset>clang:<cxxflags>-Wno-unused-variable # Temporary until we can figure out -isystem
     <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
     <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
-    <toolset>msvc:<cxxflags>"/wd4100 /bigobj"
-    <toolset>msvc,<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
+    <toolset>msvc:<cxxflags>"/wd4100 /wd4251 /bigobj"
+    <toolset>msvc:<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
     <os>LINUX:<define>_XOPEN_SOURCE=600
     <os>LINUX:<define>_GNU_SOURCE=1
     <os>SOLARIS:<define>_XOPEN_SOURCE=500