BUILD: Fix CMake autotools parsing for += rvalue that contains '='

xoreos · Feb 25, 2017 · 36f3c65 · 36f3c65
1 parent b9f56db
commit 36f3c65
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/CMakeAM.cmake b/cmake/CMakeAM.cmake
@@ -102,8 +102,8 @@ function(convert_automake_internal AM_INPUT_FILE CMAKE_OUTPUT_FILE)
     string(REGEX REPLACE " *= *"   "="   AM_FILE_LINE "${AM_FILE_LINE}")
     string(REGEX REPLACE "^ +"             ""   AM_FILE_LINE "${AM_FILE_LINE}")
 
-    string(REGEX REPLACE "^(.*)\\+=(.*)$" "list(APPEND \\1 \\2)" AM_FILE_LINE "${AM_FILE_LINE}")
-    string(REGEX REPLACE "^(.*)=(.*)$"    "set(\\1 \\2)" AM_FILE_LINE "${AM_FILE_LINE}")
+    string(REGEX REPLACE "^([^=]*[^+])=(.*)$"    "set(\\1 \\2)" AM_FILE_LINE "${AM_FILE_LINE}")
+    string(REGEX REPLACE "^([^=]*)\\+=(.*)$" "list(APPEND \\1 \\2)" AM_FILE_LINE "${AM_FILE_LINE}")
 
     string(REGEX REPLACE "^if !(.*)$"     "if(NOT \\1)" AM_FILE_LINE "${AM_FILE_LINE}")
     string(REGEX REPLACE "^if (.*)$"      "if(\\1)" AM_FILE_LINE "${AM_FILE_LINE}")