diff options
| author | Reid Kleckner <rnk@google.com> | 2020-02-28 17:21:50 -0800 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2020-03-02 10:45:14 +0100 |
| commit | f5fd8a37c18439102eb30c85dadac68c260a1a0d (patch) | |
| tree | 6d96ac1b5bd4c264ad58315e6e120dc32f6fddac | |
| parent | 5405c262a4abec1a9cf0b8b89aabbf529209262a (diff) | |
| download | bcm5719-llvm-f5fd8a37c18439102eb30c85dadac68c260a1a0d.tar.gz bcm5719-llvm-f5fd8a37c18439102eb30c85dadac68c260a1a0d.zip | |
Try to fix WindowsManifest CMake logic on Windows
CMake is complaining about the "^" regex if the prefixes are empty
strings.
(cherry picked from commit e441a584f3f7d743ab77031a47d9ad60ee56b53d)
| -rw-r--r-- | llvm/lib/WindowsManifest/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/WindowsManifest/CMakeLists.txt b/llvm/lib/WindowsManifest/CMakeLists.txt index 8cfea1282ad..7ccc17ad577 100644 --- a/llvm/lib/WindowsManifest/CMakeLists.txt +++ b/llvm/lib/WindowsManifest/CMakeLists.txt @@ -9,10 +9,12 @@ if(LIBXML2_LIBRARIES) target_link_libraries(LLVMWindowsManifest PUBLIC ${LIBXML2_LIBRARIES}) get_filename_component(xml2_library ${LIBXML2_LIBRARIES} NAME) - if(xml2_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$") + if (CMAKE_STATIC_LIBRARY_PREFIX AND + xml2_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$") string(REGEX REPLACE "^${CMAKE_STATIC_LIBRARY_PREFIX}" "" xml2_library ${xml2_library}) string(REGEX REPLACE "${CMAKE_STATIC_LIBRARY_SUFFIX}$" "" xml2_library ${xml2_library}) - elseif(xml2_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$") + elseif (CMAKE_SHARED_LIBRARY_PREFIX AND + xml2_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$") string(REGEX REPLACE "^${CMAKE_SHARED_LIBRARY_PREFIX}" "" xml2_library ${xml2_library}) string(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "" xml2_library ${xml2_library}) endif() |
