From 433a2d495a2481c63b82c11a30f7c642d6abe63f Mon Sep 17 00:00:00 2001

From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>

Date: Fri, 29 Dec 2017 19:55:49 +1100

Subject: [PATCH 1/5] FindBoost: Boost 1.66.0 dependency and release update

Release notes: http://www.boost.org/users/history/version_1_66_0.html

* All new libraries are header-only.

* _Boost_COMPONENT_DEPENDENCIES is unchanged from 1.65.1

* _Boost_FIBER_COMPILER_FEATURES is unchanged from 1.64.0

---

 Modules/FindBoost.cmake | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake

index a0fd90f771a..6434dcb7dbb 100644

--- Modules/FindBoost.cmake

+++ Modules/FindBoost.cmake

@@ -791,7 +791,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)

       set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)

       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)

     endif()

-    if(NOT Boost_VERSION VERSION_LESS 106600)

+    if(NOT Boost_VERSION VERSION_LESS 106700)

       message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")

       set(_Boost_IMPORTED_TARGETS FALSE)

     endif()

@@ -925,8 +925,8 @@ endfunction()

 # `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.

 #

 function(_Boost_COMPILER_FEATURES component _ret)

-  # Boost >= 1.62 and < 1.65

-  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)

+  # Boost >= 1.62 and < 1.67

+  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700)

     set(_Boost_FIBER_COMPILER_FEATURES

         cxx_alias_templates

         cxx_auto_type

@@ -1032,7 +1032,7 @@ else()

   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of

   # _Boost_COMPONENT_DEPENDENCIES.

   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}

-    "1.65.1" "1.65.0" "1.65"

+    "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"

     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"

     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"

     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"

From b1e9f67137733bc109d355450fcd06edda4784c5 Mon Sep 17 00:00:00 2001

From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>

Date: Fri, 29 Dec 2017 20:07:31 +1100

Subject: [PATCH 2/5] FindBoost: Fix incorrect alphabetisation of headers list

---

 Modules/FindBoost.cmake | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake

index 6434dcb7dbb..734a93cca65 100644

--- Modules/FindBoost.cmake

+++ Modules/FindBoost.cmake

@@ -825,8 +825,8 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)

   set(_Boost_CONTAINER_HEADERS           "boost/container/container_fwd.hpp")

   set(_Boost_CONTEXT_HEADERS             "boost/context/all.hpp")

   set(_Boost_COROUTINE_HEADERS           "boost/coroutine/all.hpp")

-  set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")

   set(_Boost_DATE_TIME_HEADERS           "boost/date_time/date.hpp")

+  set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")

   set(_Boost_FIBER_HEADERS               "boost/fiber/all.hpp")

   set(_Boost_FILESYSTEM_HEADERS          "boost/filesystem/path.hpp")

   set(_Boost_GRAPH_HEADERS               "boost/graph/adjacency_list.hpp")

From b044f69a413123f15a05034c00a8e3763764a1e5 Mon Sep 17 00:00:00 2001

From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>

Date: Fri, 29 Dec 2017 21:50:54 +1100

Subject: [PATCH 3/5] FindBoost: Implement "Architecture and Address Model" tag

This tag is new in Boost 1.66.0, and is present in the 'versioned'

library file name layout.

---

 Modules/FindBoost.cmake | 52 +++++++++++++++++++++++++++++++++++++++----------

 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake

index 734a93cca65..4b34802fca3 100644

--- Modules/FindBoost.cmake

+++ Modules/FindBoost.cmake

@@ -1379,8 +1379,11 @@ if(Boost_DEBUG)

 endif()

 #======================

-# Systematically build up the Boost ABI tag

-# http://boost.org/doc/libs/1_41_0/more/getting_started/windows.html#library-naming

+# Systematically build up the Boost ABI tag for the 'tagged' and 'versioned' layouts

+# http://boost.org/doc/libs/1_66_0/more/getting_started/windows.html#library-naming

+# http://boost.org/doc/libs/1_66_0/boost/config/auto_link.hpp

+# http://boost.org/doc/libs/1_66_0/tools/build/src/tools/common.jam

+# http://boost.org/doc/libs/1_66_0/boostcpp.jam

 set( _boost_RELEASE_ABI_TAG "-")

 set( _boost_DEBUG_ABI_TAG   "-")

 # Key       Use this library when:

@@ -1412,11 +1415,40 @@ if(Boost_USE_STLPORT)

   string(APPEND _boost_DEBUG_ABI_TAG "p")

 endif()

 #  n        using the STLport deprecated "native iostreams" feature

+#           removed from the documentation in 1.43.0 but still present in

+#           boost/config/auto_link.hpp

 if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)

   string(APPEND _boost_RELEASE_ABI_TAG "n")

   string(APPEND _boost_DEBUG_ABI_TAG "n")

 endif()

+#  -x86     Architecture and address model tag

+#           First character is the architecture, then word-size, either 32 or 64

+#           Only used in 'versioned' layout, added in Boost 1.66.0

+set(_boost_ARCHITECTURE_TAG "")

+# {CMAKE_CXX_COMPILER_ARCHITECTURE_ID} is not currently set for all compilers

+if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x" AND NOT Boost_VERSION VERSION_LESS 106600)

+  string(APPEND _boost_ARCHITECTURE_TAG "-")

+  # This needs to be kept in-sync with the section of CMakePlatformId.h.in

+  # inside 'defined(_WIN32) && defined(_MSC_VER)'

+  if(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "IA64")

+    string(APPEND _boost_ARCHITECTURE_TAG "i")

+  elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "X86"

+            OR ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "x64")

+    string(APPEND _boost_ARCHITECTURE_TAG "x")

+  elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} MATCHES "^ARM")

+    string(APPEND _boost_ARCHITECTURE_TAG "a")

+  elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "MIPS")

+    string(APPEND _boost_ARCHITECTURE_TAG "m")

+  endif()

+

+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)

+    string(APPEND _boost_ARCHITECTURE_TAG "64")

+  else()

+    string(APPEND _boost_ARCHITECTURE_TAG "32")

+  endif()

+endif()

+

 if(Boost_DEBUG)

   message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "

     "_boost_RELEASE_ABI_TAG = ${_boost_RELEASE_ABI_TAG}")

@@ -1610,22 +1642,22 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})

   unset(_boost_RELEASE_NAMES)

   foreach(compiler IN LISTS _boost_COMPILER)

     list(APPEND _boost_RELEASE_NAMES

-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}

+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )

   endforeach()

   list(APPEND _boost_RELEASE_NAMES

-    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}

+    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}

     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )

   if(_boost_STATIC_RUNTIME_WORKAROUND)

     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")

     foreach(compiler IN LISTS _boost_COMPILER)

       list(APPEND _boost_RELEASE_NAMES

-        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}

+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )

     endforeach()

     list(APPEND _boost_RELEASE_NAMES

-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}

+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )

   endif()

   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")

@@ -1660,11 +1692,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})

   unset(_boost_DEBUG_NAMES)

   foreach(compiler IN LISTS _boost_COMPILER)

     list(APPEND _boost_DEBUG_NAMES

-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}

+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )

   endforeach()

   list(APPEND _boost_DEBUG_NAMES

-    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}

+    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}

     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}

     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )

@@ -1672,11 +1704,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})

     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")

     foreach(compiler IN LISTS _boost_COMPILER)

       list(APPEND _boost_DEBUG_NAMES

-        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}

+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )

     endforeach()

     list(APPEND _boost_DEBUG_NAMES

-      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}

+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}

       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )

   endif()

   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")

From d56deff7d127b030739bd0034609d0046121d8cd Mon Sep 17 00:00:00 2001

From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>

Date: Fri, 29 Dec 2017 22:38:36 +1100

Subject: [PATCH 4/5] FindBoost: Search for upstream-packaged libs next to

 includes

Upstream packages Boost binaries for Windows with the 'boost' directory

(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR).

---

 Modules/FindBoost.cmake | 1 +

 1 file changed, 1 insertion(+)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake

index 4b34802fca3..479c83115c9 100644

--- Modules/FindBoost.cmake

+++ Modules/FindBoost.cmake

@@ -1496,6 +1496,7 @@ foreach(c DEBUG RELEASE)

       ${Boost_INCLUDE_DIR}/stage/lib

       )

     _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")

+    _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}")

     if( Boost_NO_SYSTEM_PATHS )

       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)

     else()

From 6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0 Mon Sep 17 00:00:00 2001

From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>

Date: Sat, 30 Dec 2017 16:00:29 +1100

Subject: [PATCH 5/5] FindBoost: Generate imported targets for future Boost

 versions

Per discussion on cmake/cmake#17575, this protection not particularly

valuable, as the dependency information which the imported targets wrap

is generated anyway.

This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to

support newly-released Boost versions pending a new CMake release.

---

 Modules/FindBoost.cmake | 1 -

 1 file changed, 1 deletion(-)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake

index 479c83115c9..ca2a9c5b358 100644

--- Modules/FindBoost.cmake

+++ Modules/FindBoost.cmake

@@ -793,7 +793,6 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)

     endif()

     if(NOT Boost_VERSION VERSION_LESS 106700)

       message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")

-      set(_Boost_IMPORTED_TARGETS FALSE)

     endif()

   endif()