diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-02-08 15:24:59 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-02-08 15:24:59 -0800 |
| commit | 4d433302417d7e2b6478d731bc222847c2cd434a (patch) | |
| tree | 41c93a7ad44df67657cf8413fed745048579baf5 /toolsrc/src/PostBuildLint_BuildPolicies.cpp | |
| parent | 95af9aac7c39765d1524b7c9c39dc283e9f0facf (diff) | |
| parent | 2e94dfe97ca44dd78b3224321b5f9e06e6635854 (diff) | |
| download | vcpkg-4d433302417d7e2b6478d731bc222847c2cd434a.tar.gz vcpkg-4d433302417d7e2b6478d731bc222847c2cd434a.zip | |
Merge branch 'master' into codicodi-ninja-support
Diffstat (limited to 'toolsrc/src/PostBuildLint_BuildPolicies.cpp')
| -rw-r--r-- | toolsrc/src/PostBuildLint_BuildPolicies.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp index d7d67c991..4e5ac3cea 100644 --- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp +++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp @@ -5,12 +5,15 @@ namespace vcpkg::PostBuildLint::BuildPolicies { static const std::string NAME_UNKNOWN = "PolicyUnknown"; + static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage"; static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs"; const std::string& type::toString() const { switch (this->backing_enum) { + case EMPTY_PACKAGE: + return NAME_EMPTY_PACKAGE; case DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS; case UNKNOWN: @@ -22,10 +25,13 @@ namespace vcpkg::PostBuildLint::BuildPolicies const std::string& type::cmake_variable() const { + 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"; switch (this->backing_enum) { + case EMPTY_PACKAGE: + return CMAKE_VARIABLE_EMPTY_PACKAGE; case DLLS_WITHOUT_LIBS: return CMAKE_VARIABLE_DLLS_WITHOUT_LIBS; case UNKNOWN: @@ -39,12 +45,17 @@ namespace vcpkg::PostBuildLint::BuildPolicies const std::vector<type>& values() { - static const std::vector<type>& v = {UNKNOWN, DLLS_WITHOUT_LIBS}; + static const std::vector<type>& v = {UNKNOWN, EMPTY_PACKAGE, DLLS_WITHOUT_LIBS}; return v; } type parse(const std::string& s) { + if (s == NAME_EMPTY_PACKAGE) + { + return BuildPolicies::EMPTY_PACKAGE; + } + if (s == NAME_DLLS_WITHOUT_LIBS) { return BuildPolicies::DLLS_WITHOUT_LIBS; |