diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-26 13:18:16 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-11-26 13:18:16 -0500 |
| commit | 1f531e0428d0aa5804fd8f4d1b58fe69edc30eed (patch) | |
| tree | e131ebde472353502ea013b5cca302d0b96a1e05 | |
| parent | 8068850fcc1575210c968365e71cb7ece6771022 (diff) | |
| parent | 0369362132b3deae30828299131647cc3754abeb (diff) | |
| download | cmake-1f531e0428d0aa5804fd8f4d1b58fe69edc30eed.tar.gz | |
Merge branch 'FindBoost-no-cxx' into release-3.13
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 3e011adfb2..bfab4ca436 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -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}") diff --git a/Tests/RunCMake/FindBoost/NoCXX-stderr.txt b/Tests/RunCMake/FindBoost/NoCXX-stderr.txt new file mode 100644 index 0000000000..8d98f9debd --- /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 0000000000..04b9cac614 --- /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 a153ae18f3..5d0577b2d3 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) |