fixup! WIP: Restore VS project

cpputest · Nov 20, 2022 · 3b9542c · 3b9542c
1 parent adc4687
commit 3b9542c
Showing 1 changed file with 75 additions and 75 deletions.
diff --git a/tests/AllTests.vcxproj b/tests/AllTests.vcxproj
@@ -92,7 +92,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\include;..\include\CppUTestExt\CppUTestGTest;..\include\CppUTestExt\CppUTestGMock;..\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CppUTest\include;..\CppUTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
@@ -131,7 +131,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\include;..\include\CppUTestExt\CppUTestGTest;..\include\CppUTestExt\CppUTestGMock;..\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CppUTest\include;..\include\CppUTestExt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
@@ -162,7 +162,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\include\CppUTestExt\CppUTestGTest;..\include\CppUTestExt\CppUTestGMock;..\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CppUTest\include;..\CppUTestExt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;CPPUTEST_USE_LONG_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -201,7 +201,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\include\CppUTestExt\CppUTestGTest;..\include\CppUTestExt\CppUTestGMock;..\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\CppUTest\include;..\CppUTestExt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;CPPUTEST_USE_LONG_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -242,79 +242,79 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CppUTest\AllocationInCFile.c" />
-    <ClCompile Include="CppUTest\AllocationInCppFile.cpp" />
-    <ClCompile Include="CppUTest\AllocLetTestFree.c" />
-    <ClCompile Include="CppUTest\AllocLetTestFreeTest.cpp" />
-    <ClCompile Include="CppUTest\CheatSheetTest.cpp" />
-    <ClCompile Include="CppUTest\CompatabilityTests.cpp" />
-    <ClCompile Include="CppUTest\CommandLineArgumentsTest.cpp" />
-    <ClCompile Include="CppUTest\CommandLineTestRunnerTest.cpp" />
-    <ClCompile Include="CppUTestExt\AllTests.cpp" />
-    <ClCompile Include="CppUTestExt\CodeMemoryReporterTest.cpp" />
-    <ClCompile Include="CppUTestExt\GMockTest.cpp" />
-    <ClCompile Include="CppUTestExt\GTest1Test.cpp" />
-    <ClCompile Include="CppUTestExt\GTest2ConvertorTest.cpp" />
-    <ClCompile Include="CppUTestExt\IEEE754PluginTest.cpp" />
-    <ClCompile Include="CppUTestExt\IEEE754PluginTest_c.c" />
-    <ClCompile Include="CppUTestExt\MemoryReportAllocatorTest.cpp" />
-    <ClCompile Include="CppUTestExt\MemoryReporterPluginTest.cpp" />
-    <ClCompile Include="CppUTestExt\MemoryReportFormatterTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockActualCallTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockCallTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockCheatSheetTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockComparatorCopierTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockExpectedCallTest.cpp" />
-    <ClCompile Include="CppUTestExt\ExpectedFunctionsListTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockFailureReporterForTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockFailureTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockHierarchyTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockNamedValueTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockParameterTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockPluginTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockReturnValueTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockStrictOrderTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockSupportTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockSupport_cTest.cpp" />
-    <ClCompile Include="CppUTestExt\MockSupport_cTestCFile.c" />
-    <ClCompile Include="CppUTestExt\OrderedTestTest.cpp" />
-    <ClCompile Include="CppUTestExt\OrderedTestTest_c.c" />
-    <ClCompile Include="CppUTest\JUnitOutputTest.cpp" />
-    <ClCompile Include="CppUTest\MemoryLeakDetectorTest.cpp" />
-    <ClCompile Include="CppUTest\MemoryOperatorOverloadTest.cpp" />
-    <ClCompile Include="CppUTest\DummyMemoryLeakDetector.cpp" />
-    <ClCompile Include="CppUTest\MemoryLeakWarningTest.cpp" />
-    <ClCompile Include="CppUTest\PluginTest.cpp" />
-    <ClCompile Include="CppUTest\PreprocessorTest.cpp" />
-    <ClCompile Include="CppUTest\SetPluginTest.cpp" />
-    <ClCompile Include="CppUTest\SimpleMutexTest.cpp" />
-    <ClCompile Include="CppUTest\SimpleStringTest.cpp" />
-    <ClCompile Include="CppUTest\TeamCityOutputTest.cpp" />
-    <ClCompile Include="CppUTest\TestFailureNaNTest.cpp" />
-    <ClCompile Include="CppUTest\TestFailureTest.cpp" />
-    <ClCompile Include="CppUTest\TestFilterTest.cpp" />
-    <ClCompile Include="CppUTest\TestHarness_cTest.cpp" />
-    <ClCompile Include="CppUTest\TestHarness_cTestCFile.c" />
-    <ClCompile Include="CppUTest\TestInstallerTest.cpp" />
-    <ClCompile Include="CppUTest\TestMemoryAllocatorTest.cpp" />
-    <ClCompile Include="CppUTest\TestOutputTest.cpp" />
-    <ClCompile Include="CppUTest\TestRegistryTest.cpp" />
-    <ClCompile Include="CppUTest\TestResultTest.cpp" />
-    <ClCompile Include="CppUTest\TestUTestMacro.cpp" />
-    <ClCompile Include="CppUTest\TestUTestStringMacro.cpp" />
-    <ClCompile Include="CppUTest\UtestPlatformTest.cpp" />
-    <ClCompile Include="CppUTest\UtestTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\AllocationInCFile.c" />
+    <ClCompile Include="..\CppUTest\tests\src\AllocationInCppFile.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\AllocLetTestFree.c" />
+    <ClCompile Include="..\CppUTest\tests\src\AllocLetTestFreeTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\CheatSheetTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\CompatabilityTests.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\CommandLineArgumentsTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\CommandLineTestRunnerTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\AllTests.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\CodeMemoryReporterTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\GMockTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\GTest1Test.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\GTest2ConvertorTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\IEEE754PluginTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\IEEE754PluginTest_c.c" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MemoryReportAllocatorTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MemoryReporterPluginTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MemoryReportFormatterTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockActualCallTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockCallTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockCheatSheetTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockComparatorCopierTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockExpectedCallTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\ExpectedFunctionsListTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockFailureReporterForTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockFailureTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockHierarchyTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockNamedValueTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockParameterTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockPluginTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockReturnValueTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockStrictOrderTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockSupportTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockSupport_cTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\MockSupport_cTestCFile.c" />
+    <ClCompile Include="..\CppUTestExt\tests\src\OrderedTestTest.cpp" />
+    <ClCompile Include="..\CppUTestExt\tests\src\OrderedTestTest_c.c" />
+    <ClCompile Include="..\CppUTest\tests\src\JUnitOutputTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\MemoryLeakDetectorTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\MemoryOperatorOverloadTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\DummyMemoryLeakDetector.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\MemoryLeakWarningTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\PluginTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\PreprocessorTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\SetPluginTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\SimpleMutexTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\SimpleStringTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TeamCityOutputTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestFailureNaNTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestFailureTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestFilterTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestHarness_cTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestHarness_cTestCFile.c" />
+    <ClCompile Include="..\CppUTest\tests\src\TestInstallerTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestMemoryAllocatorTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestOutputTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestRegistryTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestResultTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestUTestMacro.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\TestUTestStringMacro.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\UtestPlatformTest.cpp" />
+    <ClCompile Include="..\CppUTest\tests\src\UtestTest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="CppUTest\AllocationInCFile.h" />
-    <ClInclude Include="CppUTest\AllocationInCppFile.h" />
-    <ClInclude Include="CppUTest\AllocLetTestFree.h" />
-    <ClInclude Include="CppUTest\AllTests.h" />
-    <ClInclude Include="CppUTestExt\IEEE754PluginTest_c.h" />
-    <ClInclude Include="CppUTestExt\mockfailurereporterfortest.h" />
-    <ClInclude Include="CppUTestExt\MockFailureTest.h" />
-    <ClInclude Include="CppUTestExt\MockSupport_cTestCFile.h" />
-    <ClInclude Include="CppUTestExt\OrderedTestTest.h" />
+    <ClInclude Include="..\CppUTest\tests\src\AllocationInCFile.h" />
+    <ClInclude Include="..\CppUTest\tests\src\AllocationInCppFile.h" />
+    <ClInclude Include="..\CppUTest\tests\src\AllocLetTestFree.h" />
+    <ClInclude Include="..\CppUTest\tests\src\AllTests.h" />
+    <ClInclude Include="..\CppUTestExt\tests\src\IEEE754PluginTest_c.h" />
+    <ClInclude Include="..\CppUTestExt\tests\src\mockfailurereporterfortest.h" />
+    <ClInclude Include="..\CppUTestExt\tests\src\MockFailureTest.h" />
+    <ClInclude Include="..\CppUTestExt\tests\src\MockSupport_cTestCFile.h" />
+    <ClInclude Include="..\CppUTestExt\tests\src\OrderedTestTest.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">