some project cleanup

microsoft · Jan 5, 2021 · b3601ab · b3601ab
1 parent ca6a5fb
commit b3601ab
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 79 deletions.
diff --git a/src/cascadia/CommandlineArgs/AppCommandlineArgs.h b/src/cascadia/CommandlineArgs/AppCommandlineArgs.h
@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 #pragma once
 
+#include <CLI11/CLI11.hpp>
 #include "Commandline.h"
 
 #ifdef UNIT_TESTING

diff --git a/src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj b/src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj
@@ -27,9 +27,6 @@
     <ClInclude Include="AppCommandlineArgs.h" />
     <ClInclude Include="Commandline.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="PlaceholderType.h">
-      <DependentUpon>PlaceholderType.idl</DependentUpon>
-    </ClInclude>
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
@@ -38,14 +35,9 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="PlaceholderType.cpp">
-      <DependentUpon>PlaceholderType.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>
   <!-- ========================= idl Files ======================== -->
   <ItemGroup>
-    <Midl Include="PlaceholderType.idl" />
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>

diff --git a/src/cascadia/CommandlineArgs/PlaceholderType.cpp b/src/cascadia/CommandlineArgs/PlaceholderType.cpp
diff --git a/src/cascadia/CommandlineArgs/PlaceholderType.h b/src/cascadia/CommandlineArgs/PlaceholderType.h
diff --git a/src/cascadia/CommandlineArgs/PlaceholderType.idl b/src/cascadia/CommandlineArgs/PlaceholderType.idl
diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -25,7 +25,8 @@
 
     <ClCompile>
       <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
-      on being compiled with RTTI (/GR). -->
+      on being compiled with RTTI (/GR). We need this in this project, because
+      we're including the CLI11 header via the CommandlineArgs project. -->
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -287,6 +288,9 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\CommandlineArgs\CommandlineArgs.vcxproj" >
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <!-- Make sure to set ReferenceOutputAssembly=false, or we'll try and
+      MDMERGE with MUX from the CommandlineArgs output, and get duplicate type
+      errors everywhere. -->
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">

diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h
@@ -76,7 +76,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 
 #include <winrt/Windows.UI.Popups.h>
 
-#include <CLI11/CLI11.hpp>
-
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"