Merge branch 'UshakovMV_FixSolutionIssues'

IzyaSoft · Mar 24, 2017 · db7cb81 · db7cb81
2 parents 6a75f8f + bc4bd92
commit db7cb81
Show file tree

Hide file tree

Showing 36 changed files with 31 additions and 21,655 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,5 @@
 *.sdf
 *.opensdf
 *.ipch
+# Nuget
+*packages/
diff --git a/MSVS/EasyCmdLineReader.sln b/MSVS/EasyCmdLineReader.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EasyCmdLineReader", "EasyCmdLineReader\EasyCmdLineReader.vcxproj", "{F4B2158B-B831-4A79-9B4C-6D5E25008507}"
 EndProject
@@ -17,24 +17,24 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Debug|x64.ActiveCfg = Debug|x64
-		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Debug|x64.Build.0 = Debug|x64
+		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Debug|x64.ActiveCfg = Debug|Win32
+		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Debug|x64.Build.0 = Debug|Win32
 		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Debug|x86.ActiveCfg = Debug|Win32
 		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Debug|x86.Build.0 = Debug|Win32
 		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Release|x64.ActiveCfg = Release|x64
 		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Release|x64.Build.0 = Release|x64
 		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Release|x86.ActiveCfg = Release|Win32
 		{F4B2158B-B831-4A79-9B4C-6D5E25008507}.Release|x86.Build.0 = Release|Win32
-		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Debug|x64.ActiveCfg = Debug|x64
-		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Debug|x64.Build.0 = Debug|x64
+		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Debug|x64.ActiveCfg = Debug|Win32
+		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Debug|x64.Build.0 = Debug|Win32
 		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Debug|x86.ActiveCfg = Debug|Win32
 		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Debug|x86.Build.0 = Debug|Win32
 		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Release|x64.ActiveCfg = Release|x64
 		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Release|x64.Build.0 = Release|x64
 		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Release|x86.ActiveCfg = Release|Win32
 		{C3FE4BD4-B294-4839-9579-82878707D9E2}.Release|x86.Build.0 = Release|Win32
-		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Debug|x64.ActiveCfg = Debug|x64
-		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Debug|x64.Build.0 = Debug|x64
+		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Debug|x64.ActiveCfg = Debug|Win32
+		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Debug|x64.Build.0 = Debug|Win32
 		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Debug|x86.ActiveCfg = Debug|Win32
 		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Debug|x86.Build.0 = Debug|Win32
 		{4910AA66-80E3-4244-81B6-8F4E4F30DB61}.Release|x64.ActiveCfg = Release|x64

diff --git a/MSVS/EasyCmdLineReader/EasyCmdLineReader.vcxproj b/MSVS/EasyCmdLineReader/EasyCmdLineReader.vcxproj
@@ -34,7 +34,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -95,10 +95,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;EASYCMDLINEREADER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\src\;$(SolutionDir)..\src\defs\;$(SolutionDir)..\src\manager\;$(SolutionDir)..\src\parser\;$(SolutionDir)..\src\validator\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile />
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>E:\c++\EasyCmdLineReader\MSVS\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

diff --git a/MSVS/EasyCmdLineReaderTests/EasyCmdLineReaderTests.vcxproj b/MSVS/EasyCmdLineReaderTests/EasyCmdLineReaderTests.vcxproj
@@ -19,16 +19,17 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\contrib\gtest\src\gtest-all.cc" />
     <ClCompile Include="..\..\tests\easyCmdLineReaderTests.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyCmdLineReader\EasyCmdLineReader.vcxproj">
       <Project>{f4b2158b-b831-4a79-9b4c-6d5e25008507}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\tests\parser\TestCommandLineOptionsParser.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C3FE4BD4-B294-4839-9579-82878707D9E2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -39,7 +40,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -82,6 +83,9 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <Linkage-gtest>static</Linkage-gtest>
+    <IncludePath>E:\c++\EasyCmdLineReader\contrib\gtest;$(IncludePath)</IncludePath>
+    <SourcePath>$(SourcePath)</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -99,11 +103,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\src\;$(SolutionDir)..\src\defs\;$(SolutionDir)..\src\manager\;$(SolutionDir)..\src\parser\;$(SolutionDir)..\src\validator\;$(SolutionDir)..\tests\parser\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\contrib\gtest\include;$(SolutionDir)..\src\;$(SolutionDir)..\src\defs\;$(SolutionDir)..\src\manager\;$(SolutionDir)..\src\parser\;$(SolutionDir)..\src\validator\;$(SolutionDir)..\tests\parser\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>E:\c++\EasyCmdLineReader\MSVS\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -154,13 +161,13 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\googletest.1.8.0.0\build\native\googletest.targets" Condition="Exists('..\packages\googletest.1.8.0.0\build\native\googletest.targets')" />
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
+  <!--
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\googletest.1.8.0.0\build\native\googletest.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\googletest.1.8.0.0\build\native\googletest.targets'))" />
+    <Error Condition="!Exists('..\packages\gtest.1.7.0\build\native\gtest.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gtest.1.7.0\build\native\gtest.targets'))" />
   </Target>
+  -->
 </Project>
diff --git a/MSVS/EasyCmdLineReaderTests/packages.config b/MSVS/EasyCmdLineReaderTests/packages.config
diff --git a/MSVS/EasyCmdUsageExample/EasyCmdUsageExample.vcxproj b/MSVS/EasyCmdUsageExample/EasyCmdUsageExample.vcxproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

diff --git a/MSVS/packages/googletest.1.8.0.0/build/configurations.autopkg b/MSVS/packages/googletest.1.8.0.0/build/configurations.autopkg
diff --git a/MSVS/packages/googletest.1.8.0.0/build/native/default-propertiesui.xml b/MSVS/packages/googletest.1.8.0.0/build/native/default-propertiesui.xml
diff --git a/MSVS/packages/googletest.1.8.0.0/build/native/googletest.targets b/MSVS/packages/googletest.1.8.0.0/build/native/googletest.targets
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,3 +39,5 @@ @@
     *.sdf
     *.opensdf
     *.ipch
+    # Nuget
+    *packages/