From bfad2300d6aab26c392593bf5d4d68e87b43dee6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Jul 2017 13:37:52 +0100 Subject: [PATCH] cmake: Match AC_DEFINE more precisely, respecting [] quoting The regular expression previously used here to select the second comma-delimited argument won't work when we introduce an argument containing a comma, which I need to do now. We can address this by recognising Autoconf's quoting mechanism (which uses square brackets). This is not 100% right (it doesn't understand nested square brackets), but it's good enough in practice. Signed-off-by: Simon McVittie --- cmake/modules/MacrosAutotools.cmake | 2 +- configure.ac | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/modules/MacrosAutotools.cmake b/cmake/modules/MacrosAutotools.cmake index 8bb83cdf..888d5e72 100644 --- a/cmake/modules/MacrosAutotools.cmake +++ b/cmake/modules/MacrosAutotools.cmake @@ -108,7 +108,7 @@ macro(autodefine name) foreach(line ${_configure_ac}) if(line MATCHES ".*AC_DEFINE(.*${name}.*).*") string (REGEX REPLACE ".*AC_DEFINE(.*).*" "\\1" value ${line}) - string (REGEX REPLACE ".*,(.*),.*" "\\1" value2 ${value}) + string (REGEX REPLACE "[^[]*\\[[^]]*\\], *\\[([^]]*)\\],.*" "\\1" value2 ${value}) string (REPLACE "[" "" value3 ${value2}) string (REPLACE "]" "" value4 ${value3}) set(${name} ${value4}) diff --git a/configure.ac b/configure.ac index 53c8b348..7416fed7 100644 --- a/configure.ac +++ b/configure.ac @@ -262,6 +262,9 @@ fi # default (unless you don't have GLib), because they don't bloat the library # or binaries. +dnl Don't do anything too subtle here, because the CMake build system +dnl parses these lines with regular expressions. If necessary, adjust +dnl cmake/modules/MacrosAutotools.cmake to compensate. AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_40], [Ignore post-2.40 deprecations]) AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_40], [Prevent post-2.40 APIs]) -- 2.13.3