Core/Misc: backported most boost changes from master branch

dep/boost/CMakeLists.txt

@@ -8,13 +8,25 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+set(BOOST_SEARCH_HINTS)
 if(WIN32)
   if(DEFINED ENV{BOOST_ROOT})
     set(BOOST_ROOT $ENV{BOOST_ROOT})
-    list(APPEND BOOST_LIBRARYDIR
-      ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2 )
-  elseif(NOT DEFINED Boost_DIR AND NOT DEFINED BOOST_ROOT AND NOT DEFINED BOOSTROOT)
-    message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
+  endif()
+  if(DEFINED BOOST_ROOT AND MSVC)
+    # insert a dot (.) character before last digit of MSVC_TOOLSET_VERSION
+    # turn 143 into 14.3
+    string(LENGTH "${MSVC_TOOLSET_VERSION}" _BOOST_MSVC_TOOLSET_VERSION_LENGTH)
+    math(EXPR _BOOST_MSVC_TOOLSET_VERSION_LENGTH "${_BOOST_MSVC_TOOLSET_VERSION_LENGTH} - 1" OUTPUT_FORMAT DECIMAL)
+    string(SUBSTRING "${MSVC_TOOLSET_VERSION}" 0 ${_BOOST_MSVC_TOOLSET_VERSION_LENGTH} _BOOST_MSVC_TOOLSET_VERSION_MAJOR)
+    string(SUBSTRING "${MSVC_TOOLSET_VERSION}" ${_BOOST_MSVC_TOOLSET_VERSION_LENGTH} -1 _BOOST_MSVC_TOOLSET_VERSION_MINOR)
+
+    file(TO_CMAKE_PATH "${BOOST_ROOT}" BOOST_ROOT)
+    set(BOOST_SEARCH_HINTS "${BOOST_ROOT}/lib${PLATFORM}-msvc-${_BOOST_MSVC_TOOLSET_VERSION_MAJOR}.${_BOOST_MSVC_TOOLSET_VERSION_MINOR}/cmake")
+
+    unset(_BOOST_MSVC_TOOLSET_VERSION_LENGTH)
+    unset(_BOOST_MSVC_TOOLSET_VERSION_MAJOR)
+    unset(_BOOST_MSVC_TOOLSET_VERSION_MINOR)
   endif()
 
   set(Boost_USE_STATIC_LIBS        ON)
@@ -22,42 +34,32 @@ if(WIN32)
   set(Boost_USE_STATIC_RUNTIME     OFF)
 endif()
 
-set(Boost_NO_WARN_NEW_VERSIONS ON)
-
-include (CheckCXXSourceCompiles)
-
-check_cxx_source_compiles("
-  #include <regex>
-  int main() { std::wregex r(L\".*\"); }"
-  STD_HAS_WORKING_WREGEX)
-
 if (WIN32)
   # On windows the requirements are higher according to the wiki.
   set(BOOST_REQUIRED_VERSION 1.78)
 else()
-  set(BOOST_REQUIRED_VERSION 1.71)
+  set(BOOST_REQUIRED_VERSION 1.74)
 endif()
 
-if (STD_HAS_WORKING_WREGEX)
-  find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams)
-else()
-  find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex)
+find_package(Boost ${BOOST_REQUIRED_VERSION}
+  REQUIRED
+  COMPONENTS 
+    system
+    filesystem
+    thread
+    program_options
+    regex
+    locale
+  CONFIG
+  HINTS
+    ${BOOST_SEARCH_HINTS})
+
+if(NOT Boost_FOUND)
+  if(NOT DEFINED ENV{BOOST_ROOT} AND NOT DEFINED Boost_DIR AND NOT DEFINED BOOST_ROOT AND NOT DEFINED BOOSTROOT)
+    message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
+  endif()
 endif()
 
-# Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
-
-set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_IOSTREAMS_LIBRARY})
-set(CMAKE_REQUIRED_FLAGS "-std=c++11")
-check_cxx_source_compiles("
-  #include <boost/filesystem/path.hpp>
-  #include <boost/filesystem/operations.hpp>
-  int main() { boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path()); }"
-boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
-unset(CMAKE_REQUIRED_INCLUDES)
-unset(CMAKE_REQUIRED_LIBRARIES)
-unset(CMAKE_REQUIRED_FLAGS)
-
 add_library(boost INTERFACE)
 
 target_link_libraries(boost
@@ -70,19 +72,35 @@ target_include_directories(boost
 
 target_compile_definitions(boost
   INTERFACE
-    -DBOOST_ALL_NO_LIB
-    -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
-    -DBOOST_ASIO_NO_DEPRECATED
-    -DBOOST_BIND_NO_PLACEHOLDERS)
+    BOOST_ALL_NO_LIB
+    BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
+    BOOST_ASIO_NO_DEPRECATED
+    BOOST_BIND_NO_PLACEHOLDERS
+    BOOST_SYSTEM_USE_UTF8)
+
+if (WITH_BOOST_STACKTRACE AND NOT WIN32)
+  message(STATUS "libbacktrace will be linked")
+
+  include(CheckIncludeFile)
+
+  if (BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE)
+    check_include_file("${BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE}" HAS_BACKTRACE)
+    target_compile_definitions(boost
+      INTERFACE
+        BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE=${BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE})
+  else()
+    check_include_file("backtrace.h" HAS_BACKTRACE)
+  endif()
+
+  if (NOT HAS_BACKTRACE)
+    message(FATAL_ERROR "Required header 'backtrace.h' not found. If building with a compiler other than GCC, please specify the full path in the CMake option BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE.")
+  endif()
 
-if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
   target_compile_definitions(boost
     INTERFACE
-      -DBOOST_NO_CXX11_SCOPED_ENUMS)
-endif()
+      BOOST_STACKTRACE_USE_BACKTRACE)
 
-if (NOT STD_HAS_WORKING_WREGEX)
-  target_compile_definitions(boost
+  target_link_libraries(boost
     INTERFACE
-      -DTC_HAS_BROKEN_WSTRING_REGEX)
+      backtrace)
 endif()