diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-10 22:55:15 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-10 22:55:15 +0000 |
| commit | db0bf5a52f00a1a42a4c9af3b50b7879bb207942 (patch) | |
| tree | f1e1c110b80253344e641989459b3f00300da1c3 /vsprojects | |
| parent | 09b9e99bd388986f74be2eb4238c0cc67f211d93 (diff) | |
Fix MSVC projects to ensure that protoc is built before lite-test attempts to use it and that lite-test and tests don't attempt to generate the same .pb.* files at the same time.
Diffstat (limited to 'vsprojects')
| -rw-r--r-- | vsprojects/protobuf.sln | 1 | ||||
| -rw-r--r-- | vsprojects/tests.vcproj | 82 |
2 files changed, 10 insertions, 73 deletions
diff --git a/vsprojects/protobuf.sln b/vsprojects/protobuf.sln index 116c68c3..9f2e8b61 100644 --- a/vsprojects/protobuf.sln +++ b/vsprojects/protobuf.sln @@ -32,6 +32,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lite-test", "lite-test.vcproj", "{12015ACE-42BE-4952-A5A0-44A9A46908E2}"
ProjectSection(ProjectDependencies) = postProject
{49EA010D-706F-4BE2-A397-77854B72A040} = {49EA010D-706F-4BE2-A397-77854B72A040}
+ {1738D5F6-ED1E-47E0-B2F0-456864B93C1E} = {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}
EndProjectSection
EndProject
Global
diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj index c64ecca5..013ff1b4 100644 --- a/vsprojects/tests.vcproj +++ b/vsprojects/tests.vcproj @@ -199,14 +199,6 @@ >
</File>
<File
- RelativePath=".\google\protobuf\unittest_lite.pb.h"
- >
- </File>
- <File
- RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"
- >
- </File>
- <File
RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
>
</File>
@@ -219,7 +211,7 @@ >
</File>
<File
- RelativePath=".\google\protobuf\unittest_import_lite.pb.h"
+ RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"
>
</File>
<File
@@ -347,14 +339,6 @@ >
</File>
<File
- RelativePath=".\google\protobuf\unittest_lite.pb.cc"
- >
- </File>
- <File
- RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"
- >
- </File>
- <File
RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
>
</File>
@@ -367,7 +351,7 @@ >
</File>
<File
- RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"
+ RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"
>
</File>
<File
@@ -440,54 +424,6 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\src\google\protobuf\unittest_lite.proto"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating unittest_lite.pb.{h,cc}..."
- CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto
"
- Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating unittest_lite.pb.{h,cc}..."
- CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto
"
- Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\google\protobuf\unittest_lite_imports_nonlite.proto"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
- CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto
"
- Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
- CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto
"
- Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\src\google\protobuf\unittest_custom_options.proto"
>
<FileConfiguration
@@ -560,16 +496,16 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\src\google\protobuf\unittest_import_lite.proto"
+ RelativePath="..\src\google\protobuf\unittest_lite_imports_nonlite.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating unittest_import_lite.pb.{h,cc}..."
- CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto
"
- Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"
+ Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
+ CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto
"
+ Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
@@ -577,9 +513,9 @@ >
<Tool
Name="VCCustomBuildTool"
- Description="Generating unittest_import_lite.pb.{h,cc}..."
- CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto
"
- Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"
+ Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
+ CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto
"
+ Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
/>
</FileConfiguration>
</File>
|