[llvm] 1079c68 - Attempt to fix ZLIB CMake logic on Windows

[Reid Kleckner via llvm-commits]

Author: Reid Kleckner
Date: 2020-03-01T08:45:24-08:00
New Revision: 1079c68aa0fdb14d270a31c0df49a2afc5ed2485

URL: https://github.com/llvm/llvm-project/commit/1079c68aa0fdb14d270a31c0df49a2afc5ed2485
DIFF: https://github.com/llvm/llvm-project/commit/1079c68aa0fdb14d270a31c0df49a2afc5ed2485.diff

LOG: Attempt to fix ZLIB CMake logic on Windows

CMake doesn't seem to like it when you regex search for "^".

Added: 
    

Modified: 
    llvm/lib/Support/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index cf6ce986213a..77b507d20a50 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()