diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-07 14:37:17 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-07 09:37:29 -0500 |
| commit | 79afbb2bb379d0069888c2887f28d40e4b57d8d7 (patch) | |
| tree | 0f12863404f83fa037a337a048ece8279ee86f61 /Modules | |
| parent | 0a46df3c9174efc99e0d2402d15d8a6d19b0c376 (diff) | |
| parent | d4ba945c48a3af674bdd95157d18d6236f7c2472 (diff) | |
| download | cmake-79afbb2bb379d0069888c2887f28d40e4b57d8d7.tar.gz | |
Merge topic 'lib-arch-no-usr'
d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6790
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeParseLibraryArchitecture.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeParseLibraryArchitecture.cmake b/Modules/CMakeParseLibraryArchitecture.cmake index 6fb9c6bfce..f7a4b29c34 100644 --- a/Modules/CMakeParseLibraryArchitecture.cmake +++ b/Modules/CMakeParseLibraryArchitecture.cmake @@ -23,7 +23,7 @@ function(cmake_parse_library_architecture lang implicit_dirs implicit_objs outpu foreach(obj IN LISTS implicit_objs) get_filename_component(dir "${obj}" DIRECTORY) - if("${dir}" MATCHES "(/usr)+/lib/${CMAKE_LIBRARY_ARCHITECTURE_REGEX}$") + if("${dir}" MATCHES "(/usr)?/lib/${CMAKE_LIBRARY_ARCHITECTURE_REGEX}$") get_filename_component(arch "${dir}" NAME) set(library_arch "${arch}") break() |