Fix handling of backslash-newline sequences in environment variables

ampl · Mar 29, 2016 · ea11f81 · ea11f81
1 parent 22582f3
commit ea11f81
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/support/cmake/init.cmake b/support/cmake/init.cmake
@@ -72,9 +72,9 @@ if (MP_WINSDK)
     execute_process(COMMAND ${run_setenv} "${MP_SETENV}" "${setenv_arg}"
       OUTPUT_VARIABLE out ERROR_VARIABLE err)
     string(REPLACE ";" "\;" out "${out}")
-    string(REGEX MATCHALL "[^\n]+" out "${out}")
+    string(REGEX MATCHALL "[^\n]+\n" out "${out}")
     foreach (env ${out})
-      if (env MATCHES "([^=]+)=(.*)")
+      if (env MATCHES "([^=]+)=(.*)\n")
         set(ENV{${CMAKE_MATCH_1}} "${CMAKE_MATCH_2}")
       endif ()
     endforeach ()