diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-27 13:44:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-27 13:44:11 (GMT) |
| commit | 4aad340ec446e3def2bda4f2d474ab0cf86e902e (patch) | |
| tree | 43dc114432a6bd789751eb84793e16db4dc44156 | |
| parent | cee843475d82150cc56d12badd04eb737bff6551 (diff) | |
| parent | 0369362132b3deae30828299131647cc3754abeb (diff) | |
| download | CMake-4aad340ec446e3def2bda4f2d474ab0cf86e902e.zip CMake-4aad340ec446e3def2bda4f2d474ab0cf86e902e.tar.gz CMake-4aad340ec446e3def2bda4f2d474ab0cf86e902e.tar.bz2 | |
Merge topic 'FindBoost-no-cxx'
0369362132 FindBoost: Restore finding without CXX language enabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2663
| -rw-r--r-- | Modules/FindBoost.cmake | 9 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/NoCXX-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/NoCXX.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/RunCMakeTest.cmake | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index a336495..ce307fa 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -411,15 +411,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}") diff --git a/Tests/RunCMake/FindBoost/NoCXX-stderr.txt b/Tests/RunCMake/FindBoost/NoCXX-stderr.txt new file mode 100644 index 0000000..8d98f9d --- /dev/null +++ b/Tests/RunCMake/FindBoost/NoCXX-stderr.txt @@ -0,0 +1 @@ +.* diff --git a/Tests/RunCMake/FindBoost/NoCXX.cmake b/Tests/RunCMake/FindBoost/NoCXX.cmake new file mode 100644 index 0000000..04b9cac --- /dev/null +++ b/Tests/RunCMake/FindBoost/NoCXX.cmake @@ -0,0 +1 @@ +find_package(Boost) diff --git a/Tests/RunCMake/FindBoost/RunCMakeTest.cmake b/Tests/RunCMake/FindBoost/RunCMakeTest.cmake index a153ae1..5d0577b 100644 --- a/Tests/RunCMake/FindBoost/RunCMakeTest.cmake +++ b/Tests/RunCMake/FindBoost/RunCMakeTest.cmake @@ -1,3 +1,4 @@ include(RunCMake) run_cmake(CMakePackage) +run_cmake(NoCXX) |