diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-19 13:44:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-19 13:44:50 (GMT) |
| commit | dc7871739f16c75d8acb3b7d34d4c7d3f5a068af (patch) | |
| tree | e2cba7600d620b090557857f1be6ac0081d2d543 | |
| parent | a2372f64b449be23353dec9678a63053682a4169 (diff) | |
| parent | 4c741d945a343f4979fabf3f1b7509c4b70267bb (diff) | |
| download | CMake-dc7871739f16c75d8acb3b7d34d4c7d3f5a068af.zip CMake-dc7871739f16c75d8acb3b7d34d4c7d3f5a068af.tar.gz CMake-dc7871739f16c75d8acb3b7d34d4c7d3f5a068af.tar.bz2 | |
Merge topic 'cxxprefix' into release-3.20
4c741d945a BinUtils: Restore toolchain prefix detection from compiler name 'c++'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !6011
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index fd07a5c..3d1a7bb 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -161,7 +161,7 @@ if (NOT _CMAKE_TOOLCHAIN_PREFIX) if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|QCC") get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME) - if (COMPILER_BASENAME MATCHES "^(.+-)?(clang\\+\\+|g\\+\\+|clang-cl)(-[0-9]+(\\.[0-9]+)*)?(-[^.]+)?(\\.exe)?$") + if (COMPILER_BASENAME MATCHES "^(.+-)?(clang\\+\\+|[gc]\\+\\+|clang-cl)(-[0-9]+(\\.[0-9]+)*)?(-[^.]+)?(\\.exe)?$") set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) set(_CMAKE_TOOLCHAIN_SUFFIX ${CMAKE_MATCH_3}) set(_CMAKE_COMPILER_SUFFIX ${CMAKE_MATCH_5}) |