diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-03 19:09:24 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-03 19:09:24 -0800 |
| commit | b03b578ffc27a9f0d4d9c7a8edc8edeea487dce3 (patch) | |
| tree | 66cc3c484da4d6af5672b1913dfe341774f4e0b0 /toolsrc | |
| parent | d7fb7b7736cd7cd67cedab31772c60430fecb927 (diff) | |
| download | vcpkg-b03b578ffc27a9f0d4d9c7a8edc8edeea487dce3.tar.gz vcpkg-b03b578ffc27a9f0d4d9c7a8edc8edeea487dce3.zip | |
Rename policy to OnlyReleaseCRT
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/PostBuildLint_BuildPolicies.h | 6 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint_BuildPolicies.cpp | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h index 42bd3d718..d815c6d27 100644 --- a/toolsrc/include/PostBuildLint_BuildPolicies.h +++ b/toolsrc/include/PostBuildLint_BuildPolicies.h @@ -9,7 +9,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies NULLVALUE = 0, EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, - NO_DEBUG_BINARIES + ONLY_RELEASE_CRT }; struct type @@ -30,9 +30,9 @@ namespace vcpkg::PostBuildLint::BuildPolicies static constexpr type NULLVALUE(backing_enum_t::NULLVALUE); static constexpr type EMPTY_PACKAGE(backing_enum_t::EMPTY_PACKAGE); static constexpr type DLLS_WITHOUT_LIBS(backing_enum_t::DLLS_WITHOUT_LIBS); - static constexpr type NO_DEBUG_BINARIES(backing_enum_t::NO_DEBUG_BINARIES); + static constexpr type ONLY_RELEASE_CRT(backing_enum_t::ONLY_RELEASE_CRT); - static constexpr std::array<type, 3> values = { EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, NO_DEBUG_BINARIES }; + static constexpr std::array<type, 3> values = { EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT }; type parse(const std::string& s); } diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index b0edaf805..8abf71bb3 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -684,7 +684,7 @@ namespace vcpkg::PostBuildLint error_count += check_bin_folders_are_not_present_in_static_build(package_dir); - if (!contains_and_enabled(build_info.policies, BuildPolicies::NO_DEBUG_BINARIES)) + if (!contains_and_enabled(build_info.policies, BuildPolicies::ONLY_RELEASE_CRT)) { error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::DEBUG, build_info.crt_linkage), debug_libs, dumpbin_exe); } diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp index 2e0a1713b..f070a2a42 100644 --- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp +++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp @@ -8,7 +8,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage"; static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs"; - static const std::string NAME_NO_DEBUG_BINARIES = "PolicyNoDebugBinaries"; + static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT"; const std::string& type::toString() const { @@ -18,8 +18,8 @@ namespace vcpkg::PostBuildLint::BuildPolicies return NAME_EMPTY_PACKAGE; case DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS; - case NO_DEBUG_BINARIES: - return NAME_NO_DEBUG_BINARIES; + case ONLY_RELEASE_CRT: + return NAME_ONLY_RELEASE_CRT; case NULLVALUE: return NULLVALUE_STRING; default: @@ -31,7 +31,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies { static const std::string CMAKE_VARIABLE_EMPTY_PACKAGE = "VCPKG_POLICY_EMPTY_PACKAGE"; static const std::string CMAKE_VARIABLE_DLLS_WITHOUT_LIBS = "VCPKG_POLICY_DLLS_WITHOUT_LIBS"; - static const std::string CMAKE_VARIABLE_NO_DEBUG_BINARIES = "VCPKG_POLICY_NO_DEBUG_BINARIES"; + static const std::string CMAKE_VARIABLE_ONLY_RELEASE_CRT = "VCPKG_POLICY_ONLY_RELEASE_CRT"; switch (this->backing_enum) { @@ -39,8 +39,8 @@ namespace vcpkg::PostBuildLint::BuildPolicies return CMAKE_VARIABLE_EMPTY_PACKAGE; case DLLS_WITHOUT_LIBS: return CMAKE_VARIABLE_DLLS_WITHOUT_LIBS; - case NO_DEBUG_BINARIES: - return CMAKE_VARIABLE_NO_DEBUG_BINARIES; + case ONLY_RELEASE_CRT: + return CMAKE_VARIABLE_ONLY_RELEASE_CRT; case NULLVALUE: Enums::nullvalue_used(ENUM_NAME); default: @@ -60,9 +60,9 @@ namespace vcpkg::PostBuildLint::BuildPolicies return BuildPolicies::DLLS_WITHOUT_LIBS; } - if (s == NAME_NO_DEBUG_BINARIES) + if (s == NAME_ONLY_RELEASE_CRT) { - return BuildPolicies::NO_DEBUG_BINARIES; + return BuildPolicies::ONLY_RELEASE_CRT; } return BuildPolicies::NULLVALUE; |
