Skip to content

Commit 6b16ce9

Browse files
rnkzmodem
authored andcommitted
Attempt to fix ZLIB CMake logic on Windows
CMake doesn't seem to like it when you regex search for "^". (cherry picked from commit 1079c68)
1 parent 917119e commit 6b16ce9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

llvm/lib/Support/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,12 @@ if(LLVM_ENABLE_ZLIB)
198198
get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION)
199199
endif()
200200
get_filename_component(zlib_library ${zlib_library} NAME)
201-
if(zlib_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$")
201+
if(CMAKE_STATIC_LIBRARY_PREFIX AND
202+
zlib_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$")
202203
STRING(REGEX REPLACE "^${CMAKE_STATIC_LIBRARY_PREFIX}" "" zlib_library ${zlib_library})
203204
STRING(REGEX REPLACE "${CMAKE_STATIC_LIBRARY_SUFFIX}$" "" zlib_library ${zlib_library})
204-
elseif(zlib_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$")
205+
elseif(CMAKE_SHARED_LIBRARY_PREFIX AND
206+
zlib_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$")
205207
STRING(REGEX REPLACE "^${CMAKE_SHARED_LIBRARY_PREFIX}" "" zlib_library ${zlib_library})
206208
STRING(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "" zlib_library ${zlib_library})
207209
endif()

0 commit comments

Comments
 (0)