diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-06-16 11:58:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 11:58:11 -0700 |
| commit | 04e214eb0ef9cd5fc4308dd7a43943e98ae1d534 (patch) | |
| tree | e11b55a563310307a553811877f6cae21633afd1 /toolsrc/include | |
| parent | 7192d3affa4b1d8f88e3e730eb561612c24f7d78 (diff) | |
| download | vcpkg-04e214eb0ef9cd5fc4308dd7a43943e98ae1d534.tar.gz vcpkg-04e214eb0ef9cd5fc4308dd7a43943e98ae1d534.zip | |
[vcpkg] Fix create by extracting common paths settings (#11842)
Resolves #11784
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/base/system.process.h | 6 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/buildenvironment.h | 12 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/commands.h | 1 |
3 files changed, 16 insertions, 3 deletions
diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index 51ea728c3..0e6a92444 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -19,9 +19,9 @@ namespace vcpkg::System std::string s; }; - std::string make_cmake_cmd(const fs::path& cmake_exe, - const fs::path& cmake_script, - const std::vector<CMakeVariable>& pass_variables); + std::string make_basic_cmake_cmd(const fs::path& cmake_tool_path, + const fs::path& cmake_script, + const std::vector<CMakeVariable>& pass_variables); fs::path get_exe_path_of_current_process(); diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h new file mode 100644 index 000000000..4505f4972 --- /dev/null +++ b/toolsrc/include/vcpkg/buildenvironment.h @@ -0,0 +1,12 @@ +#include <vcpkg/base/system.process.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <string>
+#include <vector>
+
+namespace vcpkg
+{
+ std::string make_cmake_cmd(const VcpkgPaths& paths,
+ const fs::path& cmake_script,
+ std::vector<System::CMakeVariable>&& pass_variables);
+}
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index c4b231433..f6be93bb2 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -41,6 +41,7 @@ namespace vcpkg::Commands namespace Create { extern const CommandStructure COMMAND_STRUCTURE; + int perform(const VcpkgCmdArguments& args, const VcpkgPaths& paths); void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths); } |
