From 1c64424122c79bc8ae2035ab0a927628705c3919 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 19 Jun 2018 23:40:47 -0700
Subject: [PATCH] [cmake] Include cmake version to abi-tag. Update to 3.11.4.

---
 scripts/vcpkgTools.xml      | 30 +++++++++++++++---------------
 toolsrc/src/vcpkg/build.cpp |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 314f62701..320e86275 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <tools version="2">
     <tool name="cmake" os="windows">
-        <version>3.10.2</version>
-        <exeRelativePath>cmake-3.10.2-win32-x86\bin\cmake.exe</exeRelativePath>
-        <url>https://cmake.org/files/v3.10/cmake-3.10.2-win32-x86.zip</url>
-        <sha512>9c16861a2ac09c7011b84f38459ecfec2829a9f825b254acbbde46d98f12f8ca0d4db3a6764758cb671507ee7c0327576d87658b81d7ddf1e8280b37569eb16d</sha512>
-        <archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
+        <version>3.11.4</version>
+        <exeRelativePath>cmake-3.11.4-win32-x86\bin\cmake.exe</exeRelativePath>
+        <url>https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip</url>
+        <sha512>3d866ef3c41a9cf738427fccf4730ccf8fd86bb4d13e9a1671b156bbdb2bc6beeecc7e7e8190cea8297498cfd67366c71231e9e08b121d4cd6e5ceac04124c19</sha512>
+        <archiveName>cmake-3.11.4-win32-x86.zip</archiveName>
     </tool>
     <tool name="cmake" os="osx">
-        <version>3.10.2</version>
-        <exeRelativePath>cmake-3.10.2-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
-        <url>https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz</url>
-        <sha512>cb7d76e11c892eb786da5804282c4141564390c3552e08c506c7abb93015eb5f619c55255459872b219399ce8114ac321fe92df7f82a7e42bbc874eec240571e</sha512>
-        <archiveName>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveName>
+        <version>3.11.4</version>
+        <exeRelativePath>cmake-3.11.4-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
+        <url>https://cmake.org/files/v3.11/cmake-3.11.4-Darwin-x86_64.tar.gz</url>
+        <sha512>eeb967dc5b6e46e8dee06939b8b416d40f644baad79ffd90f86ad18e1e3b58b50dec0f064e60467125be9bedb7de8c48fbcb8a97ca731645939539f97645db54</sha512>
+        <archiveName>cmake-3.11.4-Darwin-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="cmake" os="linux">
-        <version>3.10.2</version>
-        <exeRelativePath>cmake-3.10.2-Linux-x86_64/bin/cmake</exeRelativePath>
-        <url>https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz</url>
-        <sha512>54389b5cb3f3cb9d182d35e0b1eaf7b301695899930da0d26e9df1dc25056213a077646d23ea609a93daa81d30687757d9cf0dc263339fa3d73dbeb1284bc1a9</sha512>
-        <archiveName>cmake-3.10.2-Linux-x86_64.tar.gz</archiveName>
+        <version>3.11.4</version>
+        <exeRelativePath>cmake-3.11.4-Linux-x86_64/bin/cmake</exeRelativePath>
+        <url>https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz</url>
+        <sha512>70d92eea972710684582154dc1b884536aba5abda130a431257750b54437c46397aea39c2cc31056ecf36ddadbc1cf5c22434794fb314ea67c15a9be3bd20092</sha512>
+        <archiveName>cmake-3.11.4-Linux-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="git" os="windows">
         <version>2.17.1</version>
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 53d41c217..bf3fffafe 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -458,6 +458,8 @@ namespace vcpkg::Build
 
         std::vector<AbiEntry> abi_tag_entries;
 
+        abi_tag_entries.emplace_back(AbiEntry{"cmake", Commands::Fetch::get_tool_version(paths, Tools::CMAKE)});
+
         abi_tag_entries.insert(abi_tag_entries.end(), dependency_abis.begin(), dependency_abis.end());
 
         abi_tag_entries.emplace_back(