diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-01 13:43:29 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-01 17:54:48 -0800 |
| commit | 4aef2485b9d5cf2dfbb30543963e5714dcc411c4 (patch) | |
| tree | 2bfc2e9f87069cd2606ede5a1261cb234bbdd236 | |
| parent | 7a04aff33e596b843fba2162ab9b05180fc5169c (diff) | |
| download | vcpkg-4aef2485b9d5cf2dfbb30543963e5714dcc411c4.tar.gz vcpkg-4aef2485b9d5cf2dfbb30543963e5714dcc411c4.zip | |
Split ConfigurationType into separate h/cpp
| -rw-r--r-- | toolsrc/include/PostBuildLint_BuildInfo.h | 9 | ||||
| -rw-r--r-- | toolsrc/include/PostBuildLint_ConfigurationType.h | 14 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint_BuildInfo.cpp | 13 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint_ConfigurationType.cpp | 19 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj | 2 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj.filters | 6 |
6 files changed, 42 insertions, 21 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h index 5305548e1..2685b6f7b 100644 --- a/toolsrc/include/PostBuildLint_BuildInfo.h +++ b/toolsrc/include/PostBuildLint_BuildInfo.h @@ -6,17 +6,10 @@ #include "PostBuildLint_BuildPolicies.h" #include "opt_bool.h" #include "PostBuildLint_LinkageType.h" +#include "PostBuildLint_ConfigurationType.h" namespace vcpkg::PostBuildLint { - enum class ConfigurationType - { - DEBUG = 1, - RELEASE = 2 - }; - - std::string to_string(const ConfigurationType& conf); - struct BuildType { static BuildType value_of(const ConfigurationType& config, const LinkageType& linkage); diff --git a/toolsrc/include/PostBuildLint_ConfigurationType.h b/toolsrc/include/PostBuildLint_ConfigurationType.h new file mode 100644 index 000000000..55dede921 --- /dev/null +++ b/toolsrc/include/PostBuildLint_ConfigurationType.h @@ -0,0 +1,14 @@ +#pragma once +#pragma once +#include <string> + +namespace vcpkg::PostBuildLint +{ + enum class ConfigurationType + { + DEBUG = 1, + RELEASE = 2 + }; + + std::string to_string(const ConfigurationType& conf); +} diff --git a/toolsrc/src/PostBuildLint_BuildInfo.cpp b/toolsrc/src/PostBuildLint_BuildInfo.cpp index e15e2ca73..c67c8754f 100644 --- a/toolsrc/src/PostBuildLint_BuildInfo.cpp +++ b/toolsrc/src/PostBuildLint_BuildInfo.cpp @@ -68,19 +68,6 @@ namespace vcpkg::PostBuildLint const BuildType BuildType::RELEASE_STATIC = BuildType(ConfigurationType::RELEASE, LinkageType::STATIC, R"(/DEFAULTLIB:LIBCMT[^D])"); const BuildType BuildType::RELEASE_DYNAMIC = BuildType(ConfigurationType::RELEASE, LinkageType::DYNAMIC, R"(/DEFAULTLIB:MSVCRT[^D])"); - std::string to_string(const ConfigurationType& conf) - { - switch (conf) - { - case ConfigurationType::DEBUG: - return "Debug"; - case ConfigurationType::RELEASE: - return "Release"; - default: - Checks::unreachable(); - } - } - BuildType BuildType::value_of(const ConfigurationType& config, const LinkageType& linkage) { if (config == ConfigurationType::DEBUG && linkage == LinkageType::STATIC) diff --git a/toolsrc/src/PostBuildLint_ConfigurationType.cpp b/toolsrc/src/PostBuildLint_ConfigurationType.cpp new file mode 100644 index 000000000..9c3499cac --- /dev/null +++ b/toolsrc/src/PostBuildLint_ConfigurationType.cpp @@ -0,0 +1,19 @@ +#include "pch.h" +#include "PostBuildLint_ConfigurationType.h" +#include "vcpkg_Checks.h" + +namespace vcpkg::PostBuildLint +{ + std::string to_string(const ConfigurationType& conf) + { + switch (conf) + { + case ConfigurationType::DEBUG: + return "Debug"; + case ConfigurationType::RELEASE: + return "Release"; + default: + Checks::unreachable(); + } + } +} diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 07a3dcf83..14b476b64 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -151,6 +151,7 @@ <ClInclude Include="..\include\Paragraphs.h" /> <ClInclude Include="..\include\pch.h" /> <ClInclude Include="..\include\PostBuildLint.h" /> + <ClInclude Include="..\include\PostBuildLint_ConfigurationType.h" /> <ClInclude Include="..\include\PostBuildLint_LinkageType.h" /> <ClInclude Include="..\include\SourceParagraph.h" /> <ClInclude Include="..\include\StatusParagraph.h" /> @@ -209,6 +210,7 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> </ClCompile> <ClCompile Include="..\src\PostBuildLint.cpp" /> + <ClCompile Include="..\src\PostBuildLint_ConfigurationType.cpp" /> <ClCompile Include="..\src\PostBuildLint_LinkageType.cpp" /> <ClCompile Include="..\src\Stopwatch.cpp" /> <ClCompile Include="..\src\vcpkglib.cpp" /> diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters index 7e000258d..72d73344f 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters @@ -162,6 +162,9 @@ <ClCompile Include="..\src\PostBuildLint_LinkageType.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\PostBuildLint_ConfigurationType.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\include\package_spec.h"> @@ -278,5 +281,8 @@ <ClInclude Include="..\include\PostBuildLint_LinkageType.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\include\PostBuildLint_ConfigurationType.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |
