diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-03 13:29:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 13:29:08 -0800 |
| commit | 6609d3d32efeaa4c8a8100abfc8571e5d19e98ff (patch) | |
| tree | 5a7cd536eb6e13f7fac3cf3348611d5f0795eb06 | |
| parent | 3bb83774a53a36d67789b1ba4a309e6b8d973e53 (diff) | |
| parent | 99e5f4ac5090a9558dec13ad11d95024404005e1 (diff) | |
| download | vcpkg-6609d3d32efeaa4c8a8100abfc8571e5d19e98ff.tar.gz vcpkg-6609d3d32efeaa4c8a8100abfc8571e5d19e98ff.zip | |
Merge pull request #2719 from Squareys/cmake-all-features
CMake variable for all features
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index db1360ba0..295bd240e 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -290,6 +290,7 @@ namespace vcpkg::Build const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet); std::string features; + std::string all_features; if (GlobalState::feature_packages) { for (auto&& feature : config.feature_list) @@ -300,6 +301,10 @@ namespace vcpkg::Build { features.pop_back(); } + for (auto& feature : config.scf.feature_paragraphs) + { + all_features.append(feature->name + ";"); + } } const Toolset& toolset = paths.get_toolset(pre_build_info); @@ -317,6 +322,7 @@ namespace vcpkg::Build {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"}, {"GIT", git_exe_path}, {"FEATURES", features}, + {"ALL_FEATURES", all_features}, }); const auto cmd_set_environment = make_build_env_cmd(pre_build_info, toolset); |
