diff options
author | Craig Tiller <ctiller@google.com> | 2015-12-22 14:23:51 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-12-22 14:23:51 -0800 |
commit | 00f8702c5ed38bb199050bb5e000204d9cd30f98 (patch) | |
tree | 902f39826b3d1febc25ebb7658f761351df21f39 /vsprojects/vcxproj/qps/qps.vcxproj | |
parent | 2e14b1f588a5a198a4b20d2801e199de49ac5f9c (diff) | |
parent | 67f23d783265fa6c6cc85da3fb61d42f01cadbaa (diff) |
Merge branch 'yawn' into proto_names
Diffstat (limited to 'vsprojects/vcxproj/qps/qps.vcxproj')
-rw-r--r-- | vsprojects/vcxproj/qps/qps.vcxproj | 120 |
1 files changed, 62 insertions, 58 deletions
diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj index 9c6731f929..0b017e71c1 100644 --- a/vsprojects/vcxproj/qps/qps.vcxproj +++ b/vsprojects/vcxproj/qps/qps.vcxproj @@ -52,8 +52,8 @@ </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\vsprojects\global.props" /> - <Import Project="..\..\..\vsprojects\winsock.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\global.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> @@ -62,7 +62,7 @@ <PropertyGroup Condition="'$(Configuration)'=='Release'"> <TargetName>qps</TargetName> </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> @@ -80,7 +80,8 @@ <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> @@ -98,14 +99,15 @@ <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <TreatWarningAsError>true</TreatWarningAsError> @@ -120,14 +122,15 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <TreatWarningAsError>true</TreatWarningAsError> @@ -142,97 +145,98 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> + <ItemGroup> - <ClInclude Include="..\..\..\test\cpp\qps\client.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\driver.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\histogram.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\interarrival.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\perf_db_client.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\qps_worker.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\report.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\server.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\stats.h" /> - <ClInclude Include="..\..\..\test\cpp\qps\timer.h" /> - <ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\client.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\driver.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\histogram.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\interarrival.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\perf_db_client.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\qps_worker.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\report.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\server.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\stats.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\timer.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\control.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\control.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\control.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\control.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\control.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\control.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\control.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\control.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\payloads.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\payloads.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\payloads.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\payloads.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\payloads.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\payloads.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\services.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\services.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\services.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\services.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\services.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\services.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\services.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\services.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\stats.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\stats.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\stats.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\stats.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\stats.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\stats.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\perf_db.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\perf_db.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\perf_db.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\perf_db.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\perf_db.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\perf_db.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\test\cpp\qps\client_async.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\client_async.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\client_sync.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\client_sync.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\driver.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\driver.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\perf_db_client.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\perf_db_client.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\qps_worker.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\qps_worker.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\report.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\report.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\server_async.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\server_async.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\server_sync.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\server_sync.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\qps\timer.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\timer.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\util\benchmark_config.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.cc"> </ClCompile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> <Project>{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc++_test_util\grpc++_test_util.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++_test_util\grpc++_test_util.vcxproj"> <Project>{0BE77741-552A-929B-A497-4EF7ECE17A64}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> <Project>{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}</Project> </ProjectReference> </ItemGroup> |