cpp-pm · rbsheth · Mar 13, 2020 · Jan 22, 2020 · Jan 22, 2020 · Jan 22, 2020
diff --git a/cmake/projects/Boost/atomic/hunter.cmake b/cmake/projects/Boost/atomic/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     atomic
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/chrono/hunter.cmake b/cmake/projects/Boost/chrono/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     chrono
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/context/hunter.cmake b/cmake/projects/Boost/context/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     context
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/contract/hunter.cmake b/cmake/projects/Boost/contract/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     contract
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/coroutine/hunter.cmake b/cmake/projects/Boost/coroutine/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     coroutine
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/date_time/hunter.cmake b/cmake/projects/Boost/date_time/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     date_time
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/exception/hunter.cmake b/cmake/projects/Boost/exception/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     exception
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/fiber/hunter.cmake b/cmake/projects/Boost/fiber/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     fiber
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/filesystem/hunter.cmake b/cmake/projects/Boost/filesystem/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     filesystem
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/graph/hunter.cmake b/cmake/projects/Boost/graph/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     graph
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/graph_parallel/hunter.cmake b/cmake/projects/Boost/graph_parallel/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     graph_parallel
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/hunter.cmake b/cmake/projects/Boost/hunter.cmake
@@ -422,4 +422,27 @@ endif()
 
 hunter_pick_scheme(DEFAULT url_sha1_boost)
 hunter_cacheable(Boost)
-hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "47")
+hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "48")
+
+
+if(NOT HUNTER_Boost_VERSION VERSION_LESS 1.72.0)
+    hunter_get_cmake_args(PACKAGE Boost OUT boost_cmake_args)
+    string(FIND "${boost_cmake_args}" "BUILD_SHARED_LIBS=ON" boost_shared)
+    string(FIND "${boost_cmake_args}" "USE_CONFIG_FROM_BOOST=ON" use_boost_config)
+    string(FIND "${boost_cmake_args}" "BOOST_BUILD_DYNAMIC_VSRUNTIME=NO" boost_static_runtime)
+    if(use_boost_config GREATER -1)
+    if(boost_shared LESS 0)
+        option(Boost_USE_STATIC_LIBS "Use of the static libraries" ON)
+    else()
+        option(Boost_USE_STATIC_LIBS "Use of the static libraries" OFF)
+    endif()
+
+    if(MSVC)
+        if(boost_static_runtime LESS 0)
+            option(Boost_USE_STATIC_RUNTIME "Use libraries linked statically to the C++ runtime" OFF)
+        else()
+            option(Boost_USE_STATIC_RUNTIME "Use libraries linked statically to the C++ runtime" ON)
+        endif()
+    endif()
+    endif()
+endif()
diff --git a/cmake/projects/Boost/hunter.cmake.in b/cmake/projects/Boost/hunter.cmake.in
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     boost_component
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/iostreams/hunter.cmake b/cmake/projects/Boost/iostreams/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     iostreams
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/locale/hunter.cmake b/cmake/projects/Boost/locale/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     locale
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/log/hunter.cmake b/cmake/projects/Boost/log/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     log
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/math/hunter.cmake b/cmake/projects/Boost/math/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     math
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/mpi/hunter.cmake b/cmake/projects/Boost/mpi/hunter.cmake
@@ -26,5 +26,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     mpi
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/program_options/hunter.cmake b/cmake/projects/Boost/program_options/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     program_options
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/python/hunter.cmake b/cmake/projects/Boost/python/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     python
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/random/hunter.cmake b/cmake/projects/Boost/random/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     random
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/regex/hunter.cmake b/cmake/projects/Boost/regex/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     regex
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in
@@ -105,7 +105,7 @@ configure_file(
 
 
 set(pass_boost_no_cmake_config )
-if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0)
+if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST)
   set(pass_boost_no_cmake_config --no-cmake-config)
 endif()
 
@@ -154,11 +154,6 @@ ExternalProject_Add(
     "@HUNTER_SELF@/scripts/try-copy-license.cmake"
 
     # ineffective on older Boost than 1.72.0 as we resort on --no-cmake-config
-    COMMAND
-    "@CMAKE_COMMAND@"
-    "-Dinstalldir=@HUNTER_PACKAGE_INSTALL_PREFIX@"
-    -P
-    "@HUNTER_SELF@/scripts/clean-boost-configs.cmake"
 
     LOG_CONFIGURE ${log_build}
     LOG_BUILD ${log_build}
@@ -170,4 +165,6 @@ set(HUNTER_SELF "@HUNTER_SELF@")
 set(HUNTER_PACKAGE_INSTALL_PREFIX "@HUNTER_PACKAGE_INSTALL_PREFIX@")
 set(HUNTER_Boost_VERSION "@HUNTER_Boost_VERSION@")
 
-hunter_install_boost_config()
+if(NOT USE_CONFIG_FROM_BOOST OR HUNTER_Boost_VERSION VERSION_LESS 1.72.0)
+  hunter_install_boost_config()
+endif()
diff --git a/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in
@@ -133,7 +133,7 @@ set(
     --user-config="${boost_user_jam}"
 )
 
-if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0)
+if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST)
   list(APPEND build_opts --no-cmake-config )
 endif()
 
@@ -220,7 +220,11 @@ if(has_iphoneos)
       BUILD_IN_SOURCE
       1
       INSTALL_COMMAND
-      ""
+      ./b2
+      -d0
+      ${build_opts_iphoneos}
+      install
+      "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"  
   )
 else()
   # Add dummy target
@@ -273,7 +277,11 @@ if(has_isim)
       BUILD_IN_SOURCE
       1
       INSTALL_COMMAND
-      ""
+      ./b2
+      -d0
+      ${build_opts_iphonesimulator}
+      install
+      "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"  
   )
 else()
   # Add dummy target
@@ -376,4 +384,6 @@ set(HUNTER_SELF "@HUNTER_SELF@")
 set(HUNTER_PACKAGE_INSTALL_PREFIX "@HUNTER_PACKAGE_INSTALL_PREFIX@")
 set(HUNTER_Boost_VERSION "@HUNTER_Boost_VERSION@")
 
-hunter_install_boost_config()
+if(NOT USE_CONFIG_FROM_BOOST OR HUNTER_Boost_VERSION VERSION_LESS 1.72.0)
+  hunter_install_boost_config()
+endif()
diff --git a/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in
@@ -218,6 +218,9 @@ if(has_toolset_version)
 endif()
 
 set(boost_user_jam "@HUNTER_PACKAGE_BUILD_DIR@/boost.user.jam")
+# TODO file(TO_NATIVE_PATH "${boost_user_jam}" boost_user_jam_native_path)
+# Escape --user-config=C:\projects\hunter-tdmm2\_testing\Hunter\_Base\5398c9d\30f4075\2d24521\Build\Boost\__filesystem\Build\boost.user.jam
+# Error -> Invalid character escape '\p'.
 set(
     build_opts
     -a
@@ -230,7 +233,7 @@ set(
     --with-@HUNTER_PACKAGE_COMPONENT@
 )
 
-if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0)
+if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST)
   list(APPEND build_opts --no-cmake-config )
 endif()
 
@@ -533,8 +536,8 @@ ExternalProject_Add(
     ${b2_cmd}
     -d0
     ${build_opts}
-    stage # install only libraries, headers installed in `url_sha1_boost`
-    "--stagedir=@HUNTER_PACKAGE_INSTALL_PREFIX@"
+    install
+    "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"
     --ignore-site-config # Ignore Gentoo specific optimization "none" in site config that only the patched bjam of Gentoo can understand.
     LOG_CONFIGURE ${log_build}
     LOG_BUILD ${log_build}
@@ -546,4 +549,6 @@ set(HUNTER_SELF "@HUNTER_SELF@")
 set(HUNTER_PACKAGE_INSTALL_PREFIX "@HUNTER_PACKAGE_INSTALL_PREFIX@")
 set(HUNTER_Boost_VERSION "@HUNTER_Boost_VERSION@")
 
-hunter_install_boost_config()
+if(NOT USE_CONFIG_FROM_BOOST OR HUNTER_Boost_VERSION VERSION_LESS 1.72.0)
+  hunter_install_boost_config()
+endif()
diff --git a/cmake/projects/Boost/serialization/hunter.cmake b/cmake/projects/Boost/serialization/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     serialization
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/signals/hunter.cmake b/cmake/projects/Boost/signals/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     signals
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/stacktrace/hunter.cmake b/cmake/projects/Boost/stacktrace/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     stacktrace
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/system/hunter.cmake b/cmake/projects/Boost/system/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     system
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/test/hunter.cmake b/cmake/projects/Boost/test/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     test
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/thread/hunter.cmake b/cmake/projects/Boost/thread/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     thread
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/timer/hunter.cmake b/cmake/projects/Boost/timer/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     timer
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/cmake/projects/Boost/wave/hunter.cmake b/cmake/projects/Boost/wave/hunter.cmake
@@ -18,5 +18,5 @@ hunter_download(
     Boost
     PACKAGE_COMPONENT
     wave
-    PACKAGE_INTERNAL_DEPS_ID "47"
+    PACKAGE_INTERNAL_DEPS_ID "48"
 )
diff --git a/docs/packages/pkg/Boost.rst b/docs/packages/pkg/Boost.rst
@@ -88,6 +88,15 @@ config file (``boost/config/user.hpp``):
     #define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
     #define BOOST_MPL_LIMIT_LIST_SIZE 3
 
+  - Option ``USE_CONFIG_FROM_BOOST=ON`` use the package configuration file provided 
+    by the boost project.
+    Since boost version 1.70.0, the boost project provide a well maintained package 
+    configuration file for use with find_package's config mode.
+    See the difference between following example:
+    - `Boost-log <https://github.com/cpp-pm/hunter/blob/master/examples/Boost-log/CMakeLists.txt>`__
+    - `Boost-log-usingBoostConfig <https://github.com/cpp-pm/hunter/blob/master/examples/Boost-log-usingBoostConfig/CMakeLists.txt>`__
+
+
 Python
 ------
 

diff --git a/examples/Boost-chrono-1-64/CMakeLists.txt b/examples/Boost-chrono-1-64/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright (c) 2013, Ruslan Baratov
+# All rights reserved.
+
+cmake_minimum_required(VERSION 3.0)
+
+# Emulate HunterGate:
+# * https://github.com/hunter-packages/gate
+include("../common.cmake")
+
+project(download-boost)
+
+hunter_add_package(Boost COMPONENTS system chrono)
+find_package(Boost CONFIG REQUIRED system chrono)
+
+add_executable(foo foo.cpp)
+target_link_libraries(
+    foo
+    PUBLIC
+    Boost::chrono
+    Boost::system # Should be last
+        # Boost 1.66.0, Linux, Clang with -stdlib=libstdc++:
+        # * https://travis-ci.org/ingenue/hunter/jobs/318140468#L2651
+)
diff --git a/examples/Boost-chrono-1-64/foo.cpp b/examples/Boost-chrono-1-64/foo.cpp
@@ -0,0 +1,6 @@
+#include <boost/chrono/system_clocks.hpp>
+
+int main() {
+    boost::chrono::system_clock::now();
+    return 0;
+}