From 63ee5048c769c06285144d00bfa2020c94e17f76 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 19 Apr 2017 11:24:30 -0700
Subject: [PATCH] Fix and tidy up CMake build scripts:

This cleans up the Boost CMake configuration and
also fixes a bug in MSVC builds with mismatched
static versus dynamic runtime linkage.
---
 CHANGELOG.md   |   6 +++
 CMakeLists.txt | 100 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c74c83c8..2dcb1650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.0-b34
+
+* Fix and tidy up CMake build scripts
+
+--------------------------------------------------------------------------------
+
 1.0.0-b33
 
 * Require Visual Studio 2015 Update 3 or later
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ece8f30..c8201458 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,20 @@
 # Part of Beast
 
-cmake_minimum_required (VERSION 3.2)
+cmake_minimum_required (VERSION 3.5.2)
 
 project (Beast)
 
-option(Boost_USE_STATIC_LIBS "Use static libraries for boost" ON)
-
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
 if (MSVC)
     # /wd4244 /wd4127
-    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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GL /MT")
-    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi /Ot /MT")
+    add_definitions (-D_WIN32_WINNT=0x0601)
+    add_definitions (-D_SCL_SECURE_NO_WARNINGS=1)
+    add_definitions (-D_CRT_SECURE_NO_WARNINGS=1)
+
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100 /wd4244 /wd4251 /MP /W4 /bigobj")
+    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GL")
+    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi /Ot")
 
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
     set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
@@ -30,16 +32,45 @@ else()
     find_package(Threads)
 
     set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wpedantic -Wno-unused-parameter -DBOOST_COROUTINES_NO_DEPRECATION_WARNING=1")
+      "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wpedantic -Wno-unused-parameter")
 endif()
 
-set(Boost_USE_MULTITHREADED ON)
+#-------------------------------------------------------------------------------
+#
+# Boost
+#
 
-find_package(Boost REQUIRED COMPONENTS coroutine context thread filesystem program_options system)
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIR})
+option (Boost_USE_STATIC_LIBS "Use static libraries for boost" ON)
 
-add_definitions ("-DBOOST_COROUTINES_NO_DEPRECATION_WARNING")
+set (Boost_NO_SYSTEM_PATHS ON)
+set (Boost_USE_MULTITHREADED ON)
+
+unset (Boost_INCLUDE_DIR CACHE)
+unset (Boost_LIBRARY_DIRS CACHE)
+find_package (Boost REQUIRED COMPONENTS
+    coroutine
+    context
+    filesystem
+    program_options
+    system
+    thread
+    )
+
+include_directories (SYSTEM ${Boost_INCLUDE_DIRS})
+link_libraries (${Boost_LIBRARIES})
+
+if (MSVC)
+    add_definitions (-DBOOST_ALL_NO_LIB) # disable autolinking
+elseif (MINGW)
+    link_libraries(ws2_32 mswsock)
+endif()
+
+add_definitions (-DBOOST_COROUTINES_NO_DEPRECATION_WARNING=1) # for asio
+
+#-------------------------------------------------------------------------------
+#
+# OpenSSL
+#
 
 if (APPLE AND NOT DEFINED ENV{OPENSSL_ROOT_DIR})
   find_program(HOMEBREW brew)
@@ -52,9 +83,29 @@ endif()
 
 find_package(OpenSSL)
 
-if (MINGW)
-    link_libraries(${Boost_LIBRARIES} ws2_32 mswsock)
-endif()
+#
+#-------------------------------------------------------------------------------
+
+function(DoGroupSources curdir rootdir folder)
+    file(GLOB children RELATIVE ${PROJECT_SOURCE_DIR}/${curdir} ${PROJECT_SOURCE_DIR}/${curdir}/*)
+    foreach(child ${children})
+        if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/${curdir}/${child})
+            DoGroupSources(${curdir}/${child} ${rootdir} ${folder})
+        elseif(${child} STREQUAL "CMakeLists.txt")
+            source_group("" FILES ${PROJECT_SOURCE_DIR}/${curdir}/${child})
+        else()
+            string(REGEX REPLACE ^${rootdir} ${folder} groupname ${curdir})
+            string(REPLACE "/" "\\" groupname ${groupname})
+            source_group(${groupname} FILES ${PROJECT_SOURCE_DIR}/${curdir}/${child})
+        endif()
+    endforeach()
+endfunction()
+
+function(GroupSources curdir folder)
+    DoGroupSources(${curdir} ${curdir} ${folder})
+endfunction()
+
+#-------------------------------------------------------------------------------
 
 if ("${VARIANT}" STREQUAL "coverage")
     set(CMAKE_CXX_FLAGS
@@ -77,25 +128,6 @@ elseif ("${VARIANT}" STREQUAL "release")
     set(CMAKE_BUILD_TYPE RELEASE)
 endif()
 
-function(DoGroupSources curdir rootdir folder)
-    file(GLOB children RELATIVE ${PROJECT_SOURCE_DIR}/${curdir} ${PROJECT_SOURCE_DIR}/${curdir}/*)
-    foreach(child ${children})
-        if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/${curdir}/${child})
-            DoGroupSources(${curdir}/${child} ${rootdir} ${folder})
-        elseif(${child} STREQUAL "CMakeLists.txt")
-            source_group("" FILES ${PROJECT_SOURCE_DIR}/${curdir}/${child})
-        else()
-            string(REGEX REPLACE ^${rootdir} ${folder} groupname ${curdir})
-            string(REPLACE "/" "\\" groupname ${groupname})
-            source_group(${groupname} FILES ${PROJECT_SOURCE_DIR}/${curdir}/${child})
-        endif()
-    endforeach()
-endfunction()
-
-function(GroupSources curdir folder)
-    DoGroupSources(${curdir} ${curdir} ${folder})
-endfunction()
-
 include_directories (extras)
 include_directories (include)