diff options
| author | Reid Kleckner <rnk@google.com> | 2020-03-01 08:45:22 -0800 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2020-03-02 10:59:51 +0100 |
| commit | 6b16ce944fef5f3b30b7dcc001b3af478e038668 (patch) | |
| tree | df4266509a413c757582cb6c398aa668696009d3 | |
| parent | 917119e95aa1e4ce99395f93f2eb696613c556ff (diff) | |
| download | bcm5719-llvm-6b16ce944fef5f3b30b7dcc001b3af478e038668.tar.gz bcm5719-llvm-6b16ce944fef5f3b30b7dcc001b3af478e038668.zip | |
Attempt to fix ZLIB CMake logic on Windows
CMake doesn't seem to like it when you regex search for "^".
(cherry picked from commit 1079c68aa0fdb14d270a31c0df49a2afc5ed2485)
| -rw-r--r-- | llvm/lib/Support/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index e23f7989e77..5c656164e77 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -198,10 +198,12 @@ if(LLVM_ENABLE_ZLIB) get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION) endif() get_filename_component(zlib_library ${zlib_library} NAME) - if(zlib_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$") + if(CMAKE_STATIC_LIBRARY_PREFIX AND + zlib_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$") STRING(REGEX REPLACE "^${CMAKE_STATIC_LIBRARY_PREFIX}" "" zlib_library ${zlib_library}) STRING(REGEX REPLACE "${CMAKE_STATIC_LIBRARY_SUFFIX}$" "" zlib_library ${zlib_library}) - elseif(zlib_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$") + elseif(CMAKE_SHARED_LIBRARY_PREFIX AND + zlib_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$") STRING(REGEX REPLACE "^${CMAKE_SHARED_LIBRARY_PREFIX}" "" zlib_library ${zlib_library}) STRING(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "" zlib_library ${zlib_library}) endif() |
