From 09c40e741a6c0609955fd34dd2154fc7d500ce8c Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 9 Oct 2019 16:24:13 -0400 Subject: [PATCH] [cmake] Make regex in extract_flags.cmake more generic --- share/cmake/extract_flags.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/cmake/extract_flags.cmake b/share/cmake/extract_flags.cmake index 184882a1..af9a8157 100644 --- a/share/cmake/extract_flags.cmake +++ b/share/cmake/extract_flags.cmake @@ -64,6 +64,6 @@ macro(extract_flags target) # We have to replace generator expressions explicitly string(REGEX REPLACE "\\$" "\\1" ${target}_LDFLAGS "${${target}_LDFLAGS}") string(REGEX REPLACE "\\$" "\\1" ${target}_CXXFLAGS "${${target}_CXXFLAGS}") - string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^ ]*>" "" ${target}_LDFLAGS "${${target}_LDFLAGS}") - string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^ ]*>" "" ${target}_CXXFLAGS "${${target}_CXXFLAGS}") + string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^>]*>" "" ${target}_LDFLAGS "${${target}_LDFLAGS}") + string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^>]*>" "" ${target}_CXXFLAGS "${${target}_CXXFLAGS}") endmacro()