Commit bb585ed1 authored by Tarasenko Alexander's avatar Tarasenko Alexander

fixed gtest build

parent 0a249754
......@@ -94,7 +94,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10;</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)\kdlib\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)\kdlib\include;$(ProjectDir)\googletest\include;$(ProjectDir)\googletest;$(ProjectDir)\googlemock\include;$(ProjectDir)\googlemock</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
......@@ -114,7 +114,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10;</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)\kdlib\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)\kdlib\include;$(ProjectDir)\googletest\include;$(ProjectDir)\googletest;$(ProjectDir)\googlemock\include;$(ProjectDir)\googlemock</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<Link>
......@@ -210,11 +210,13 @@
<ItemGroup>
<ClCompile Include="..\comdate\testfunc.cpp" />
<ClCompile Include="..\comdate\testvars.cpp" />
<ClCompile Include="gmock\gmock-gtest-all.cc">
<ClCompile Include="googlemock\src\gmock-all.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="googletest\src\gtest-all.cc">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="kdlibtest.cpp" />
<ClCompile Include="stdafx.cpp">
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="gmock\gmock-gtest-all.cc" />
<ClCompile Include="kdlibtest.cpp" />
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="..\comdate\testvars.cpp">
......@@ -10,6 +9,8 @@
<ClCompile Include="..\comdate\testfunc.cpp">
<Filter>testdata</Filter>
</ClCompile>
<ClCompile Include="googletest\src\gtest-all.cc" />
<ClCompile Include="googlemock\src\gmock-all.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment