Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 461436 Details for
Bug 590244
dev-libs/boost-1.62.0-r1 dev-util/boost-build-1.62.0-r1 stable request
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
FindBoost.cmake: diff between 3.6.3 and 3.7.1
find_boost-3.6.3-3.7.1.diff (text/plain), 15.07 KB, created by
Andrew Petelin
on 2017-01-25 20:25:13 UTC
(
hide
)
Description:
FindBoost.cmake: diff between 3.6.3 and 3.7.1
Filename:
MIME Type:
Creator:
Andrew Petelin
Created:
2017-01-25 20:25:13 UTC
Size:
15.07 KB
patch
obsolete
>--- FindBoost-3.6.3.cmake 2017-01-25 23:16:25.431770491 +0300 >+++ FindBoost-3.7.1.cmake 2017-01-25 23:16:09.677754834 +0300 >@@ -1,3 +1,6 @@ >+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying >+# file Copyright.txt or https://cmake.org/licensing for details. >+ > #.rst: > # FindBoost > # --------- >@@ -202,25 +205,6 @@ > # > # Set Boost_NO_BOOST_CMAKE to ON to disable the search for boost-cmake. > >-#============================================================================= >-# Copyright 2006-2012 Kitware, Inc. >-# Copyright 2006-2008 Andreas Schneider <mail@cynapses.org> >-# Copyright 2007 Wengo >-# Copyright 2007 Mike Jackson >-# Copyright 2008 Andreas Pakulat <apaku@gmx.de> >-# Copyright 2008-2012 Philip Lowman <philip@yhbt.com> >-# >-# Distributed under the OSI-approved BSD License (the "License"); >-# see accompanying file Copyright.txt for details. >-# >-# This software is distributed WITHOUT ANY WARRANTY; without even the >-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. >-# See the License for more information. >-#============================================================================= >-# (To distribute this file outside of CMake, substitute the full >-# License text for the above reference.) >- >- > #------------------------------------------------------------------------------- > # Before we go searching, check whether boost-cmake is available, unless the > # user specifically asked NOT to search for boost-cmake. >@@ -442,24 +426,26 @@ > endif() > elseif (GHSMULTI) > set(_boost_COMPILER "-ghs") >- elseif (MSVC14) >- set(_boost_COMPILER "-vc140") >- elseif (MSVC12) >- set(_boost_COMPILER "-vc120") >- elseif (MSVC11) >- set(_boost_COMPILER "-vc110") >- elseif (MSVC10) >- set(_boost_COMPILER "-vc100") >- elseif (MSVC90) >- set(_boost_COMPILER "-vc90") >- elseif (MSVC80) >- set(_boost_COMPILER "-vc80") >- elseif (MSVC71) >- set(_boost_COMPILER "-vc71") >- elseif (MSVC70) # Good luck! >- set(_boost_COMPILER "-vc7") # yes, this is correct >- elseif (MSVC60) # Good luck! >- set(_boost_COMPILER "-vc6") # yes, this is correct >+ elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") >+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) >+ set(_boost_COMPILER "-vc140") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) >+ set(_boost_COMPILER "-vc120") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17) >+ set(_boost_COMPILER "-vc110") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16) >+ set(_boost_COMPILER "-vc100") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15) >+ set(_boost_COMPILER "-vc90") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14) >+ set(_boost_COMPILER "-vc80") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.10) >+ set(_boost_COMPILER "-vc71") >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13) # Good luck! >+ set(_boost_COMPILER "-vc7") # yes, this is correct >+ else() # MSVC60 Good luck! >+ set(_boost_COMPILER "-vc6") # yes, this is correct >+ endif() > elseif (BORLAND) > set(_boost_COMPILER "-bcb") > elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") >@@ -739,6 +725,21 @@ > set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic) > set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) > set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) >+ elseif(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106300) >+ set(_Boost_CHRONO_DEPENDENCIES system) >+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time) >+ set(_Boost_COROUTINE_DEPENDENCIES context system) >+ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time) >+ set(_Boost_FILESYSTEM_DEPENDENCIES system) >+ set(_Boost_IOSTREAMS_DEPENDENCIES regex) >+ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic) >+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) >+ set(_Boost_MPI_DEPENDENCIES serialization) >+ set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization) >+ set(_Boost_RANDOM_DEPENDENCIES system) >+ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic) >+ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) >+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) > else() > message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}") > set(_Boost_IMPORTED_TARGETS FALSE) >@@ -774,6 +775,7 @@ > 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_FIBER_HEADERS "boost/fiber/all.hpp") > set(_Boost_FILESYSTEM_HEADERS "boost/filesystem/path.hpp") > set(_Boost_GRAPH_HEADERS "boost/graph/adjacency_list.hpp") > set(_Boost_GRAPH_PARALLEL_HEADERS "boost/graph/adjacency_list.hpp") >@@ -805,6 +807,10 @@ > set(_Boost_UNIT_TEST_FRAMEWORK_HEADERS "boost/test/framework.hpp") > set(_Boost_WAVE_HEADERS "boost/wave.hpp") > set(_Boost_WSERIALIZATION_HEADERS "boost/archive/text_wiarchive.hpp") >+ if(WIN32) >+ set(_Boost_BZIP2_HEADERS "boost/iostreams/filter/bzip2.hpp") >+ set(_Boost_ZLIB_HEADERS "boost/iostreams/filter/zlib.hpp") >+ endif() > > string(TOUPPER ${component} uppercomponent) > set(${_hdrs} ${_Boost_${uppercomponent}_HEADERS} PARENT_SCOPE) >@@ -862,6 +868,37 @@ > endfunction() > > # >+# Update library search directory hint variable with paths used by prebuilt boost binaries. >+# >+# Prebuilt windows binaries (https://sourceforge.net/projects/boost/files/boost-binaries/) >+# have library directories named using MSVC compiler version and architecture. >+# This function would append corresponding directories if MSVC is a current compiler, >+# so having `BOOST_ROOT` would be enough to specify to find everything. >+# >+macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir) >+ if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") >+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) >+ set(_arch_suffix 64) >+ else() >+ set(_arch_suffix 32) >+ endif() >+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) >+ list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0) >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) >+ list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0) >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17) >+ list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-11.0) >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16) >+ list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-10.0) >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15) >+ list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-9.0) >+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14) >+ list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-8.0) >+ endif() >+ endif() >+endmacro() >+ >+# > # End functions/macros > # > #------------------------------------------------------------------------------- >@@ -907,7 +944,7 @@ > # _Boost_COMPONENT_HEADERS. See the instructions at the top of > # _Boost_COMPONENT_DEPENDENCIES. > set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} >- "1.61.0" "1.61" "1.60.0" "1.60" >+ "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" > "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1" >@@ -1143,8 +1180,8 @@ > math(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000") > math(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100") > >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}") >+ string(APPEND Boost_ERROR_REASON >+ "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}") > if(Boost_DEBUG) > message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " > "version.hpp reveals boost " >@@ -1166,16 +1203,16 @@ > endif() > if(NOT Boost_FOUND) > # State that we found a version of Boost that is too new or too old. >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") >+ string(APPEND Boost_ERROR_REASON >+ "\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") > if (Boost_FIND_VERSION_PATCH) >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}") >+ string(APPEND Boost_ERROR_REASON >+ ".${Boost_FIND_VERSION_PATCH}") > endif () > if (NOT Boost_FIND_VERSION_EXACT) >- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)") >+ string(APPEND Boost_ERROR_REASON " (or newer)") > endif () >- set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.") >+ string(APPEND Boost_ERROR_REASON ".") > endif () > else() > # Caller will accept any Boost version. >@@ -1183,8 +1220,8 @@ > endif() > else() > set(Boost_FOUND 0) >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.") >+ string(APPEND Boost_ERROR_REASON >+ "Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.") > endif() > > # ------------------------------------------------------------------------ >@@ -1261,17 +1298,18 @@ > # g using debug versions of the standard and runtime > # support libraries > if(WIN32 AND Boost_USE_DEBUG_RUNTIME) >- if(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl" >+ if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" >+ OR "${CMAKE_CXX_COMPILER}" MATCHES "icl" > OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc") >- set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}g") >+ string(APPEND _boost_DEBUG_ABI_TAG "g") > endif() > endif() > # y using special debug build of python > if(Boost_USE_DEBUG_PYTHON) >- set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}y") >+ string(APPEND _boost_DEBUG_ABI_TAG "y") > endif() > # d using a debug version of your code >-set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}d") >+string(APPEND _boost_DEBUG_ABI_TAG "d") > # p using the STLport standard library rather than the > # default one supplied with your compiler > if(Boost_USE_STLPORT) >@@ -1319,8 +1357,10 @@ > > if(BOOST_ROOT) > list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${BOOST_ROOT}/lib ${BOOST_ROOT}/stage/lib) >+ _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} BOOST_ROOT) > elseif(_ENV_BOOST_ROOT) > list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${_ENV_BOOST_ROOT}/lib ${_ENV_BOOST_ROOT}/stage/lib) >+ _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} _ENV_BOOST_ROOT) > endif() > > list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} >@@ -1599,26 +1639,26 @@ > set(Boost_FOUND 0) > # We were unable to find some libraries, so generate a sensible > # error message that lists the libraries we were unable to find. >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}\nCould not find the following") >+ string(APPEND Boost_ERROR_REASON >+ "\nCould not find the following") > if(Boost_USE_STATIC_LIBS) >- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} static") >+ string(APPEND Boost_ERROR_REASON " static") > endif() >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON} Boost libraries:\n") >+ string(APPEND Boost_ERROR_REASON >+ " Boost libraries:\n") > foreach(COMPONENT ${_Boost_MISSING_COMPONENTS}) >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON} ${Boost_NAMESPACE}_${COMPONENT}\n") >+ string(APPEND Boost_ERROR_REASON >+ " ${Boost_NAMESPACE}_${COMPONENT}\n") > endforeach() > > list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED) > list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS) > if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS}) >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.") >+ string(APPEND Boost_ERROR_REASON >+ "No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.") > else () >- set(Boost_ERROR_REASON >- "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.") >+ string(APPEND Boost_ERROR_REASON >+ "Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.") > endif () > endif () > >@@ -1697,13 +1737,6 @@ > IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" > IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") > endif() >- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") >- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY >- IMPORTED_CONFIGURATIONS DEBUG) >- set_target_properties(Boost::${COMPONENT} PROPERTIES >- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" >- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") >- endif() > if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") > set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY > IMPORTED_CONFIGURATIONS RELEASE) >@@ -1711,6 +1744,13 @@ > IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" > IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") > endif() >+ if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") >+ set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY >+ IMPORTED_CONFIGURATIONS DEBUG) >+ set_target_properties(Boost::${COMPONENT} PROPERTIES >+ IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" >+ IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") >+ endif() > if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) > unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) > foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 590244
:
453956
| 461436