Skip to content

P
protobuf
Commit bbbd4d30 authored by kenton@google.com's avatar kenton@google.com
Browse files
Options

Update MSVC project files to work with new gtest bundling strategy.

parent 37ad00d2
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 128 deletions
autogen.sh
View file @ bbbd4d30
......@@ -18,6 +18,15 @@ if test ! -e gtest; then
set -ex
curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx
mv gtest-1.3.0 gtest
# Temporary hack: Must change C runtime library to "multi-threaded DLL",
# otherwise it will be set to "multi-threaded static" when MSVC upgrades
# the project file to MSVC 2005/2008. vladl of Google Test says gtest will
# probably change their default to match, then this will be unnecessary.
# One of these mappings converts the debug configuration and the other
# converts the release configuration. I don't know which is which.
sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
else
set -ex
fi
......
vsprojects/libprotobuf.vcproj
View file @ bbbd4d30
......@@ -348,15 +348,15 @@
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\strutil.cc"
RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\substitute.cc"
RelativePath="..\src\google\protobuf\stubs\strutil.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"
RelativePath="..\src\google\protobuf\stubs\substitute.cc"
>
</File>
<File
......
vsprojects/protobuf.sln
View file @ bbbd4d30
......@@ -18,9 +18,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests.vcproj", "{4
ProjectSection(ProjectDependencies) = postProject
{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE} = {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30} = {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}
{3AF54C8A-10BF-4332-9147-F68ED9862032} = {3AF54C8A-10BF-4332-9147-F68ED9862032}
{1738D5F6-ED1E-47E0-B2F0-456864B93C1E} = {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\gtest\msvc\gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\gtest\msvc\gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -43,6 +49,14 @@ Global
{4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Debug|Win32.Build.0 = Debug|Win32
{4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Release|Win32.ActiveCfg = Release|Win32
{4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Release|Win32.Build.0 = Release|Win32
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32
{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.ActiveCfg = Debug|Win32
{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.Build.0 = Debug|Win32
{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.ActiveCfg = Release|Win32
{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
vsprojects/tests.vcproj
View file @ bbbd4d30
......@@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305"
Optimization="0"
AdditionalIncludeDirectories="../src;."
AdditionalIncludeDirectories="../src;.;../gtest/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305"
AdditionalIncludeDirectories="../src;."
AdditionalIncludeDirectories="../src;.;../gtest/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -191,59 +191,19 @@
>
</File>
<File
RelativePath="..\src\gtest\internal\gtest-death-test-internal.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest-death-test.h"
>
</File>
<File
RelativePath="..\src\gtest\internal\gtest-filepath.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest-internal-inl.h"
>
</File>
<File
RelativePath="..\src\gtest\internal\gtest-internal.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest-message.h"
>
</File>
<File
RelativePath="..\src\gtest\internal\gtest-port.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest-spi.h"
>
</File>
<File
RelativePath="..\src\gtest\internal\gtest-string.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest_pred_impl.h"
RelativePath="..\src\google\protobuf\test_util.h"
>
</File>
<File
RelativePath="..\src\gtest\gtest_prod.h"
RelativePath=".\google\protobuf\unittest.pb.h"
>
</File>
<File
RelativePath="..\src\google\protobuf\test_util.h"
RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
>
</File>
<File
RelativePath=".\google\protobuf\unittest.pb.h"
RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"
>
</File>
<File
......@@ -258,14 +218,6 @@
RelativePath=".\google\protobuf\unittest_optimize_for.pb.h"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
......@@ -279,23 +231,15 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\src\google\protobuf\stubs\common_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"
RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"
RelativePath="..\src\google\protobuf\stubs\common_unittest.cc"
>
</File>
<File
......@@ -338,26 +282,6 @@
RelativePath="..\src\google\protobuf\testing\googletest.cc"
>
</File>
<File
RelativePath="..\src\gtest\gtest-death-test.cc"
>
</File>
<File
RelativePath="..\src\gtest\gtest-filepath.cc"
>
</File>
<File
RelativePath="..\src\gtest\gtest-port.cc"
>
</File>
<File
RelativePath="..\src\gtest\gtest.cc"
>
</File>
<File
RelativePath="..\src\gtest\gtest_main.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"
>
......@@ -382,6 +306,14 @@
RelativePath="..\src\google\protobuf\repeated_field_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc"
>
</File>
<File
RelativePath="..\src\google\protobuf\test_util.cc"
>
......@@ -399,23 +331,23 @@
>
</File>
<File
RelativePath=".\google\protobuf\unittest_import.pb.cc"
RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_mset.pb.cc"
RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"
RelativePath=".\google\protobuf\unittest_import.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.cc"
RelativePath=".\google\protobuf\unittest_mset.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"
>
</File>
<File
......@@ -480,16 +412,16 @@
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_import.proto"
RelativePath="..\src\google\protobuf\unittest_custom_options.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_import.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc"
Description="Generating unittest_custom_options.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
......@@ -497,23 +429,23 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_import.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc"
Description="Generating unittest_custom_options.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_mset.proto"
RelativePath="..\src\google\protobuf\unittest_embed_optimize_for.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_mset.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc"
Description="Generating unittest_embed_optimize_for.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
......@@ -521,23 +453,23 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_mset.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc"
Description="Generating unittest_embed_optimize_for.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_optimize_for.proto"
RelativePath="..\src\google\protobuf\unittest_import.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_optimize_for.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
Description="Generating unittest_import.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
......@@ -545,23 +477,23 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_optimize_for.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
Description="Generating unittest_import.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_embed_optimize_for.proto"
RelativePath="..\src\google\protobuf\unittest_mset.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_embed_optimize_for.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc"
Description="Generating unittest_mset.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
......@@ -569,23 +501,23 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_embed_optimize_for.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc"
Description="Generating unittest_mset.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_custom_options.proto"
RelativePath="..\src\google\protobuf\unittest_optimize_for.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_custom_options.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
Description="Generating unittest_optimize_for.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
......@@ -593,9 +525,9 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_custom_options.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
Description="Generating unittest_optimize_for.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
/>
</FileConfiguration>
</File>
......
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