From 42a0acabae2f5fd466ade8d793c5ec7764ff30a8 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Tue, 10 Jul 2018 16:45:50 -0700
Subject: [PATCH] Update the MinGW settings to have the PATH which is needed
 for cache generation

---
 mingw64/CMakeSettings.json | 38 ++++++++++++++++----------------------
 mingw64/Readme.md          |  5 ++---
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/mingw64/CMakeSettings.json b/mingw64/CMakeSettings.json
index 0c248a7..8ed8d83 100644
--- a/mingw64/CMakeSettings.json
+++ b/mingw64/CMakeSettings.json
@@ -1,45 +1,39 @@
 {
   "configurations": [
     {
+      // Test Comment
       "environments": [
         {
-          "environment": "mysql_env",
-          "inheritEnvironments": [ "msvc_x64_x64" ],
-          "PATH": "${env.PATH};F:\\CMake\\mysql-server\\bison\\GnuWin32\\bin"
+          "MINGW64_ROOT": "C:\\msys64\\mingw64",
+          "BIN_ROOT": "${env.MINGW64_ROOT}\\bin",
+          "FLAVOR": "x86_64-w64-mingw32",
+          "TOOLSET_VERSION": "7.3.0",
+          "PATH": "${env.MINGW64_ROOT}\\bin;${env.MINGW64_ROOT}\\..\\usr\\local\\bin;${env.MINGW64_ROOT}\\..\\usr\\bin;${env.MINGW64_ROOT}\\..\\bin;${env.PATH}",
+          "INCLUDE": "${env.INCLUDE};${env.MINGW64_ROOT}\\include\\c++\\${env.TOOLSET_VERSION};${env.MINGW64_ROOT}\\include\\c++\\${env.TOOLSET_VERSION}\\tr1;${env.MINGW64_ROOT}\\include\\c++\\${env.TOOLSET_VERSION}\\${env.FLAVOR}",
+          "environment": "mingw_64"
         }
       ],
-      "name": "x64-Debug",
+      "name": "Mingw64-Debug",
+      "description": "TemplateDescription_Localize_Mingw64Debug",
       "generator": "Ninja",
       "configurationType": "Debug",
       "inheritEnvironments": [
-        "mysql_env", "msvc_x64_x64"
+        "mingw_64"
       ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
+      "intelliSenseMode": "linux-gcc-x64",
       "variables": [
         {
-          "name": "CMAKE_TOOLCHAIN_FILE",
-          "value": "F:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
-        },
-
-        {
-          "name": "VCPKG_TARGET_TRIPLE",
-          "value": "x64-windows-static"
+          "name": "CMAKE_C_COMPILER",
+          "value": "${env.BIN_ROOT}\\gcc.exe"
         },
         {
-          "name": "WITH_BOOST",
-          "value": "F:\\CMake\\Boost"
-        },
-        {
-          "name": "DOWNLOAD_BOOST",
-          "value": "1"
-        },
-        {
-          "name": "OPENSSL_ROOT_DIR",
-          "value": "F:\\vcpkg\\buildtrees\\openssl\\src\\openssl-1.0.2n"
+          "name": "CMAKE_CXX_COMPILER",
+          "value": "${env.BIN_ROOT}\\g++.exe"
         }
       ]
     }
diff --git a/mingw64/Readme.md b/mingw64/Readme.md
index 9045005..3b5fb27 100644
--- a/mingw64/Readme.md
+++ b/mingw64/Readme.md
@@ -1,8 +1,7 @@
 # mingw64
-This CMakeSettings sets up the necessary settings to get mingw64 (from msys2) to wor
+This CMakeSettings sets up the necessary settings to get mingw64 (from msys2) to work
 
-It assumes a that your root for mingw64 is at C:\MSys
-1) You've installed to C:\Msys
+It assumes that your root for mingw64 is at C:\msys64