diff --git a/llvm/cmake/modules/GetLibraryName.cmake b/llvm/cmake/modules/GetLibraryName.cmake deleted file mode 100644 --- a/llvm/cmake/modules/GetLibraryName.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# Returns library name for a given path. -function(get_library_name path name) - get_filename_component(path ${path} NAME) - set(prefixes ${CMAKE_FIND_LIBRARY_PREFIXES}) - set(suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES}) - list(FILTER prefixes EXCLUDE REGEX "^\\s*$") - list(FILTER suffixes EXCLUDE REGEX "^\\s*$") - if(prefixes) - string(REPLACE ";" "|" prefixes "${prefixes}") - string(REGEX REPLACE "^(${prefixes})" "" path ${path}) - endif() - if(suffixes) - string(REPLACE ";" "|" suffixes "${suffixes}") - string(REGEX REPLACE "(${suffixes})$" "" path ${path}) - endif() - set(${name} "${path}" PARENT_SCOPE) -endfunction() diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -301,7 +301,6 @@ if(NOT zlib_library) get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION) endif() - get_library_name(${zlib_library} zlib_library) set(llvm_system_libs ${llvm_system_libs} "${zlib_library}") endif() @@ -314,7 +313,6 @@ if(NOT zstd_library) get_property(zstd_library TARGET ${zstd_target} PROPERTY LOCATION) endif() - get_library_name(${zstd_library} zstd_library) set(llvm_system_libs ${llvm_system_libs} "${zstd_library}") endif() @@ -322,7 +320,6 @@ if(NOT terminfo_library) get_property(terminfo_library TARGET Terminfo::terminfo PROPERTY LOCATION) endif() - get_library_name(${terminfo_library} terminfo_library) set(llvm_system_libs ${llvm_system_libs} "${terminfo_library}") endif() diff --git a/llvm/lib/WindowsManifest/CMakeLists.txt b/llvm/lib/WindowsManifest/CMakeLists.txt --- a/llvm/lib/WindowsManifest/CMakeLists.txt +++ b/llvm/lib/WindowsManifest/CMakeLists.txt @@ -29,6 +29,5 @@ if(NOT libxml2_library) get_property(libxml2_library TARGET LibXml2::LibXml2 PROPERTY LOCATION) endif() - get_library_name(${libxml2_library} libxml2_library) set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS ${libxml2_library}) endif()