diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeParseLibraryArchitecture.cmake | 11 | ||||
| -rw-r--r-- | Modules/Platform/Linux.cmake | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/Modules/CMakeParseLibraryArchitecture.cmake b/Modules/CMakeParseLibraryArchitecture.cmake index aa6fd74..f2bb07a 100644 --- a/Modules/CMakeParseLibraryArchitecture.cmake +++ b/Modules/CMakeParseLibraryArchitecture.cmake @@ -22,17 +22,6 @@ function(cmake_parse_library_architecture implicit_dirs output_var) endforeach() endif() - if(CMAKE_LIBRARY_ARCHITECTURE_REGEX_VERSIONED AND NOT library_arch) - foreach(dir ${implicit_dirs}) - if("${dir}" MATCHES "/${CMAKE_LIBRARY_ARCHITECTURE_REGEX_VERSIONED}$") - get_filename_component(arch "${dir}" DIRECTORY) - get_filename_component(arch "${arch}" NAME) - set(library_arch "${arch}") - break() - endif() - endforeach() - endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL QCC) foreach(dir ${implicit_dirs}) if (dir MATCHES "/lib$") 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) |