Merge pull request #381 from wx257osn2/better-regexp

Refactor regexp
poac-dev · Apr 13, 2021 · e450302 · e450302
2 parents 147f055 + cdd4e28
commit e450302
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmake/AddLibArchive.cmake b/cmake/AddLibArchive.cmake
@@ -11,7 +11,7 @@ endif()
 
 find_package(LibArchive)
 if (LibArchive_FOUND)
-    if (STATIC_LINK_FLAG MATCHES "(^-static )|( -static )|(^-static$)|( -static$)" AND NOT APPLE AND ${LibArchive_LIBRARIES} MATCHES ".*\.so$")
+  if (STATIC_LINK_FLAG MATCHES "(^| )-static($| )" AND NOT APPLE AND ${LibArchive_LIBRARIES} MATCHES ".*\.so$")
         unset(LibArchive_LIBRARIES)
         unset(LibArchive_LIBRARY CACHE)
         find_library(LibArchive_LIBRARY
@@ -28,7 +28,7 @@ if (LibArchive_FOUND)
 
     target_include_directories(${PROJECT_NAME} PRIVATE ${LibArchive_INCLUDE_DIR})
     list(APPEND POAC_DEPENDENCIES ${LibArchive_LIBRARIES})
-    if (STATIC_LINK_FLAG MATCHES "(^-static )|( -static )|(^-static$)|( -static$)" AND NOT APPLE)
+    if (STATIC_LINK_FLAG MATCHES "(^| )-static($| )" AND NOT APPLE)
         list(APPEND POAC_DEPENDENCIES acl)
         list(APPEND POAC_DEPENDENCIES z)
     endif ()

diff --git a/cmake/AddOpenSSL.cmake b/cmake/AddOpenSSL.cmake
@@ -12,7 +12,7 @@ endif ()
 
 find_package(OpenSSL REQUIRED)
 if (OPENSSL_FOUND)
-    if (STATIC_LINK_FLAG MATCHES "(^-static )|( -static )|(^-static$)|( -static$)" AND NOT APPLE)
+    if (STATIC_LINK_FLAG MATCHES "(^| )-static($| )" AND NOT APPLE)
         foreach(x IN LISTS OPENSSL_LIBRARIES)
             string(REGEX REPLACE "[.]so" ".a" x ${x})
             list(APPEND OPENSSL_STATIC_LIBRARIES ${x})