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 | ebc812a8d1ec53a03f6ccbec1374a6a2321301ad (patch) | |
| tree | 4cb5d0e9696f931ca6fe46212018f38da34b56df /Modules/Platform | |
| parent | 9c43461418172332695a7ebf9e248566381469ac (diff) | |
| parent | 764606e25616e9f47eceb3227a3b38fcef544820 (diff) | |
| download | CMake-ebc812a8d1ec53a03f6ccbec1374a6a2321301ad.zip CMake-ebc812a8d1ec53a03f6ccbec1374a6a2321301ad.tar.gz CMake-ebc812a8d1ec53a03f6ccbec1374a6a2321301ad.tar.bz2 | |
Merge topic 'nvhpc-lib-arch'
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) |