mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindBoost: Restore finding without CXX language enabled

Browse Source 
Since commit v3.13.0~7^2 (FindBoost: Improve compiler prefix
detection for GCC 5+ and clang 4+, 2018-11-07) we run the internal
`_Boost_COMPILER_DUMPVERSION` macro on all UNIX platforms.  Teach
the macro to tolerate missing `CMAKE_CXX_COMPILER_VERSION`, which
occurs when the CXX language is not enabled.

Fixes: #18624
This commit is contained in:
Brad King
2018-11-26 13:06:12 -05:00
parent 05a2ca7f87
commit 0369362132
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindBoost.cmake
View File

@@ -409,15 +409,12 @@ endmacro()
#-------------------------------------------------------------------------------
#
# Runs compiler with "-dumpversion" and parses major/minor
# version with a regex.
#
# Convert CMAKE_CXX_COMPILER_VERSION to boost compiler suffix version.
function(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION _OUTPUT_VERSION_MAJOR _OUTPUT_VERSION_MINOR)
string(REGEX REPLACE "([0-9]+)\\.([0-9]+)(\\.[0-9]+)?" "\\1"
_boost_COMPILER_VERSION_MAJOR ${CMAKE_CXX_COMPILER_VERSION})
_boost_COMPILER_VERSION_MAJOR "${CMAKE_CXX_COMPILER_VERSION}")
string(REGEX REPLACE "([0-9]+)\\.([0-9]+)(\\.[0-9]+)?" "\\2"
_boost_COMPILER_VERSION_MINOR ${CMAKE_CXX_COMPILER_VERSION})
_boost_COMPILER_VERSION_MINOR "${CMAKE_CXX_COMPILER_VERSION}")
set(_boost_COMPILER_VERSION "${_boost_COMPILER_VERSION_MAJOR}${_boost_COMPILER_VERSION_MINOR}")

1
Tests/RunCMake/FindBoost/NoCXX-stderr.txt Normal file
View File

@@ -0,0 +1 @@
.*

1
Tests/RunCMake/FindBoost/NoCXX.cmake Normal file
View File

@@ -0,0 +1 @@
find_package(Boost)

1
Tests/RunCMake/FindBoost/RunCMakeTest.cmake
View File

@@ -1,3 +1,4 @@
include(RunCMake)
run_cmake(CMakePackage)
run_cmake(NoCXX)