mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-19 18:45:52 +00:00
68 lines
3.7 KiB
Diff
68 lines
3.7 KiB
Diff
--- FindBoost.cmake 2018-12-12 11:15:12.000000000 -0800
|
|
+++ FindBoost_patched.cmake 2018-12-12 11:53:19.000000000 -0800
|
|
@@ -458,10 +458,32 @@
|
|
elseif (GHSMULTI)
|
|
set(_boost_COMPILER "-ghs")
|
|
elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
|
|
- if(MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
|
|
+ #[========================================================[
|
|
+ NOTE: newer versions of FindBoost from kitware
|
|
+ change this version check to use MSVC_TOOLSET_VERSION.
|
|
+ That variable only exists in make 3.12 or greater, so
|
|
+ until all envs (including bundled visual studio) have
|
|
+ this min version of cmake, stick with this
|
|
+ CMAKE_CXX_COMPILER_VERSION check
|
|
+ #]========================================================]
|
|
+ if(DEFINED MSVC_TOOLSET_VERSION AND MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
|
|
set(_boost_COMPILER "-vc141;-vc140")
|
|
- elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
|
|
+ elseif(DEFINED MSVC_TOOLSET_VERSION AND MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
|
|
set(_boost_COMPILER "-vc${MSVC_TOOLSET_VERSION}")
|
|
+ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
|
|
+ set(_boost_COMPILER "-vc141;-vc140")
|
|
+ elseif (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!
|
|
@@ -1018,12 +1040,27 @@
|
|
else()
|
|
set(_arch_suffix 32)
|
|
endif()
|
|
- if(MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
|
|
+ if(DEFINED MSVC_TOOLSET_VERSION AND MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
|
|
list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.1)
|
|
list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
|
|
- elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
|
|
+ elseif(DEFINED MSVC_TOOLSET_VERSION AND MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
|
|
math(EXPR _toolset_major_version "${MSVC_TOOLSET_VERSION} / 10")
|
|
list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-${_toolset_major_version}.0)
|
|
+ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
|
|
+ list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.1)
|
|
+ list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
|
|
+ elseif(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()
|
|
set(${componentlibvar} ${${componentlibvar}} PARENT_SCOPE)
|
|
endif()
|