From f93b3ccc4fb85bb9ef3f3f15d240647b44769fc4 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 10 Mar 2017 16:39:04 -0800
Subject: [PATCH] Introduce make_cmake_cmd() helper function

---
 toolsrc/include/vcpkglib.h | 14 ++++++++++++++
 toolsrc/src/vcpkglib.cpp   | 14 +++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkglib.h
index 1ce55bd8a..353bfb0a0 100644
--- a/toolsrc/include/vcpkglib.h
+++ b/toolsrc/include/vcpkglib.h
@@ -17,4 +17,18 @@ namespace vcpkg
     };
 
     std::vector<StatusParagraph_and_associated_files> get_installed_files(const vcpkg_paths& paths, const StatusParagraphs& status_db);
+
+
+    struct CMakeVariable
+    {
+        CMakeVariable(const std::wstring& varname, const wchar_t* varvalue);
+        CMakeVariable(const std::wstring& varname, const std::string& varvalue);
+        CMakeVariable(const std::wstring& varname, const std::wstring& varvalue);
+        CMakeVariable(const std::wstring& varname, const fs::path& path);
+
+        std::wstring s;
+    };
+
+    std::wstring make_cmake_cmd(const fs::path& cmake_exe, const fs::path& cmake_script, const std::vector<CMakeVariable>& pass_variables);
+
 } // namespace vcpkg
diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp
index 2415372db..7ea33da0a 100644
--- a/toolsrc/src/vcpkglib.cpp
+++ b/toolsrc/src/vcpkglib.cpp
@@ -3,6 +3,7 @@
 #include "vcpkg_Files.h"
 #include "Paragraphs.h"
 #include "metrics.h"
+#include "vcpkg_Strings.h"
 
 namespace vcpkg
 {
@@ -159,7 +160,7 @@ namespace vcpkg
             x86-windows/include/FLAC++/all.h
             x86-windows/include/FLAC++/decoder.h
             x86-windows/include/FLAC++/encoder.h
-         */
+        */
         // Note that after sorting, the FLAC++/ group will be placed before the FLAC/ group
         // The new format is lexicographically sorted
         std::sort(lines->begin(), lines->end());
@@ -200,4 +201,15 @@ namespace vcpkg
 
         return installed_files;
     }
+
+    CMakeVariable::CMakeVariable(const std::wstring& varname, const wchar_t* varvalue) : s(Strings::wformat(LR"("-D%s=%s")", varname, varvalue)) { }
+    CMakeVariable::CMakeVariable(const std::wstring& varname, const std::string& varvalue) : CMakeVariable(varname, Strings::utf8_to_utf16(varvalue).c_str()) { }
+    CMakeVariable::CMakeVariable(const std::wstring& varname, const std::wstring& varvalue) : CMakeVariable(varname, varvalue.c_str()) {}
+    CMakeVariable::CMakeVariable(const std::wstring& varname, const fs::path& path) : CMakeVariable(varname, path.generic_wstring()) {}
+
+    std::wstring make_cmake_cmd(const fs::path& cmake_exe, const fs::path& cmake_script, const std::vector<CMakeVariable>& pass_variables)
+    {
+        std::wstring cmd_cmake_pass_variables = Strings::wjoin(L" ", pass_variables, [](auto&& v) { return v.s; });
+        return Strings::wformat(LR"("%s" %s -P "%s")", cmake_exe.native(), cmd_cmake_pass_variables, cmake_script.generic_wstring());
+    }
 }