diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-06 12:32:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-06 12:32:34 (GMT) |
| commit | e061a201b63df75c15eb714f68e5097839222bda (patch) | |
| tree | 69423676ae819be8e78bb38204f8794663c7a3a7 /Modules/Platform | |
| parent | 2d6a3fd626ad154d92d9345aa3fcb218d188d7ca (diff) | |
| parent | 764606e25616e9f47eceb3227a3b38fcef544820 (diff) | |
| download | CMake-e061a201b63df75c15eb714f68e5097839222bda.zip CMake-e061a201b63df75c15eb714f68e5097839222bda.tar.gz CMake-e061a201b63df75c15eb714f68e5097839222bda.tar.bz2 | |
Merge topic 'nvhpc-lib-arch' into release-3.20
764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths
5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5984
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Linux.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index 23b48bd..b5d5464 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -48,7 +48,6 @@ endif() # Match multiarch library directory names. set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") -set(CMAKE_LIBRARY_ARCHITECTURE_REGEX_VERSIONED "gcc/[a-z0-9_]+(-[a-z0-9_]+)?-linux(-gnu)?/[0-9]+(\\.[0-9]+\\.[0-9]+)*") include(Platform/UnixPaths) |