aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-08-01 13:46:26 -0700
committerGitHub <noreply@github.com>2020-08-01 13:46:26 -0700
commitf225ba822b55a2ba9d3cc2a3c4e0646c8f47f035 (patch)
treed8454e9c65d547838773b2d1e39c074bd8ec48ab /toolsrc/include
parent54ec974afefae1864b423335ba8bcb64291d2317 (diff)
downloadvcpkg-f225ba822b55a2ba9d3cc2a3c4e0646c8f47f035.tar.gz
vcpkg-f225ba822b55a2ba9d3cc2a3c4e0646c8f47f035.zip
[vcpkg manifest] look at `platform` directives (#12548)
Fixes #12538
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/vcpkg/commands.setinstalled.h3
-rw-r--r--toolsrc/include/vcpkg/packagespec.h2
-rw-r--r--toolsrc/include/vcpkg/portfileprovider.h3
3 files changed, 6 insertions, 2 deletions
diff --git a/toolsrc/include/vcpkg/commands.setinstalled.h b/toolsrc/include/vcpkg/commands.setinstalled.h
index 38cd81369..c5723669b 100644
--- a/toolsrc/include/vcpkg/commands.setinstalled.h
+++ b/toolsrc/include/vcpkg/commands.setinstalled.h
@@ -12,8 +12,7 @@ namespace vcpkg::Commands::SetInstalled
const PortFileProvider::PathsPortFileProvider& provider,
IBinaryProvider& binary_provider,
const CMakeVars::CMakeVarProvider& cmake_vars,
- const std::vector<FullPackageSpec>& specs,
- const Build::BuildPackageOptions& install_plan_options,
+ Dependencies::ActionPlan action_plan,
DryRun dry_run,
const Optional<fs::path>& pkgsconfig_path);
void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet);
diff --git a/toolsrc/include/vcpkg/packagespec.h b/toolsrc/include/vcpkg/packagespec.h
index 495056884..e23aa924e 100644
--- a/toolsrc/include/vcpkg/packagespec.h
+++ b/toolsrc/include/vcpkg/packagespec.h
@@ -21,6 +21,8 @@ namespace vcpkg
///
struct PackageSpec
{
+ constexpr static StringLiteral MANIFEST_NAME = "default";
+
PackageSpec() = default;
PackageSpec(std::string name, Triplet triplet) : m_name(std::move(name)), m_triplet(triplet) { }
diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h
index e4b5d9cb5..e26580729 100644
--- a/toolsrc/include/vcpkg/portfileprovider.h
+++ b/toolsrc/include/vcpkg/portfileprovider.h
@@ -32,7 +32,10 @@ namespace vcpkg::PortFileProvider
std::vector<const SourceControlFileLocation*> load_all_control_files() const override;
private:
+ const SourceControlFileLocation* load_manifest_file() const;
+
Files::Filesystem& filesystem;
+ fs::path manifest;
std::vector<fs::path> ports_dirs;
mutable std::unordered_map<std::string, SourceControlFileLocation> cache;
};