Split LinkageType into separate h/cpp

6 files changed, 59 insertions, 40 deletions

diff --git a/toolsrc/include/PostBuildLint_BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h
index cf444ce90..5305548e1 100644
--- a/toolsrc/include/PostBuildLint_BuildInfo.h
+++ b/toolsrc/include/PostBuildLint_BuildInfo.h
@@ -5,20 +5,10 @@
 #include <regex>
 #include "PostBuildLint_BuildPolicies.h"
 #include "opt_bool.h"
+#include "PostBuildLint_LinkageType.h"
 
 namespace vcpkg::PostBuildLint
 {
-    enum class LinkageType
-    {
-        DYNAMIC,
-        STATIC,
-        UNKNOWN
-    };
-
-    LinkageType linkage_type_value_of(const std::string& as_string);
-
-    std::string to_string(const LinkageType& build_info);
-
     enum class ConfigurationType
     {
         DEBUG = 1,
diff --git a/toolsrc/include/PostBuildLint_LinkageType.h b/toolsrc/include/PostBuildLint_LinkageType.h
new file mode 100644
index 000000000..7cca97639
--- /dev/null
+++ b/toolsrc/include/PostBuildLint_LinkageType.h
@@ -0,0 +1,16 @@
+#pragma once
+#include <string>
+
+namespace vcpkg::PostBuildLint
+{
+    enum class LinkageType
+    {
+        DYNAMIC,
+        STATIC,
+        UNKNOWN
+    };
+
+    LinkageType linkage_type_value_of(const std::string& as_string);
+
+    std::string to_string(const LinkageType& build_info);
+}
diff --git a/toolsrc/src/PostBuildLint_BuildInfo.cpp b/toolsrc/src/PostBuildLint_BuildInfo.cpp
index 59896e168..e15e2ca73 100644
--- a/toolsrc/src/PostBuildLint_BuildInfo.cpp
+++ b/toolsrc/src/PostBuildLint_BuildInfo.cpp
@@ -68,35 +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])");
 
-    LinkageType linkage_type_value_of(const std::string& as_string)
-
-    {
-        if (as_string == "dynamic")
-        {
-            return LinkageType::DYNAMIC;
-        }
-
-        if (as_string == "static")
-        {
-            return LinkageType::STATIC;
-        }
-
-        return LinkageType::UNKNOWN;
-    }
-
-    std::string to_string(const LinkageType& build_info)
-    {
-        switch (build_info)
-        {
-            case LinkageType::STATIC:
-                return "static";
-            case LinkageType::DYNAMIC:
-                return "dynamic";
-            default:
-                Checks::unreachable();
-        }
-    }
-
     std::string to_string(const ConfigurationType& conf)
     {
         switch (conf)
diff --git a/toolsrc/src/PostBuildLint_LinkageType.cpp b/toolsrc/src/PostBuildLint_LinkageType.cpp
new file mode 100644
index 000000000..8a3f35be8
--- /dev/null
+++ b/toolsrc/src/PostBuildLint_LinkageType.cpp
@@ -0,0 +1,34 @@
+#include "pch.h"
+#include "PostBuildLint_LinkageType.h"
+#include "vcpkg_Checks.h"
+
+namespace vcpkg::PostBuildLint
+{
+    LinkageType linkage_type_value_of(const std::string& as_string)
+    {
+        if (as_string == "dynamic")
+        {
+            return LinkageType::DYNAMIC;
+        }
+
+        if (as_string == "static")
+        {
+            return LinkageType::STATIC;
+        }
+
+        return LinkageType::UNKNOWN;
+    }
+
+    std::string to_string(const LinkageType& build_info)
+    {
+        switch (build_info)
+        {
+        case LinkageType::STATIC:
+            return "static";
+        case LinkageType::DYNAMIC:
+            return "dynamic";
+        default:
+            Checks::unreachable();
+        }
+    }
+}
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index c1730367d..07a3dcf83 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_LinkageType.h" />
     <ClInclude Include="..\include\SourceParagraph.h" />
     <ClInclude Include="..\include\StatusParagraph.h" />
     <ClInclude Include="..\include\StatusParagraphs.h" />
@@ -208,6 +209,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\src\PostBuildLint.cpp" />
+    <ClCompile Include="..\src\PostBuildLint_LinkageType.cpp" />
     <ClCompile Include="..\src\Stopwatch.cpp" />
     <ClCompile Include="..\src\vcpkglib.cpp" />
     <ClCompile Include="..\src\package_spec.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
index 65d2dd202..7e000258d 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
@@ -159,6 +159,9 @@
     <ClCompile Include="..\src\PostBuildLint_BuildPolicies.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\PostBuildLint_LinkageType.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\package_spec.h">
@@ -272,5 +275,8 @@
     <ClInclude Include="..\include\PostBuildLint_BuildPolicies.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\PostBuildLint_LinkageType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file