revert unecessary reordering
MODIFY
include/vcpkg/build.h
include/vcpkg/build.h
@@ -117,6 +117,31 @@ namespace vcpkg::Build
std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
std::string create_user_troubleshooting_message(const PackageSpec& spec);
+ /// <summary>
+ /// Settings from the triplet file which impact the build environment and post-build checks
+ /// </summary>
+ struct PreBuildInfo
+ {
+ /// <summary>
+ /// Runs the triplet file in a "capture" mode to create a PreBuildInfo
+ /// </summary>
+ static PreBuildInfo from_triplet_file(const VcpkgPaths& paths,
+ const Triplet& triplet,
+ Optional<const std::string&> port = nullopt);
+
+ std::string triplet_abi_tag;
+ std::string target_architecture;
+ std::string cmake_system_name;
+ std::string cmake_system_version;
+ Optional<std::string> platform_toolset;
+ Optional<fs::path> visual_studio_path;
+ Optional<std::string> external_toolchain_file;
+ Optional<ConfigurationType> build_type;
+ std::vector<std::string> passthrough_env_vars;
+ };
+
+ std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
+
enum class VcpkgTripletVar
{
TARGET_ARCHITECTURE = 0,
@@ -177,31 +202,6 @@ namespace vcpkg::Build
const BuildPackageConfig& config,
const StatusParagraphs& status_db);
- /// <summary>
- /// Settings from the triplet file which impact the build environment and post-build checks
- /// </summary>
- struct PreBuildInfo
- {
- /// <summary>
- /// Runs the triplet file in a "capture" mode to create a PreBuildInfo
- /// </summary>
- static PreBuildInfo from_triplet_file(const VcpkgPaths& paths,
- const Triplet& triplet,
- Optional<const std::string&> port = nullopt);
-
- std::string triplet_abi_tag;
- std::string target_architecture;
- std::string cmake_system_name;
- std::string cmake_system_version;
- Optional<std::string> platform_toolset;
- Optional<fs::path> visual_studio_path;
- Optional<std::string> external_toolchain_file;
- Optional<ConfigurationType> build_type;
- std::vector<std::string> passthrough_env_vars;
- };
-
- std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
-
enum class BuildPolicy
{
EMPTY_PACKAGE,

revert unecessary reordering