diff options
| author | Feng Xiao <xiaofeng@google.com> | 2015-08-26 11:25:08 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-08-26 11:25:08 -0700 |
| commit | 66b074f4919d726b97023bc56a657f5676c76323 (patch) | |
| tree | 73584ec33029e8e38ba72e573e7d68f19bcd9e4c | |
| parent | 7e05a2d20d07279f125723f9ab7b1864badf0996 (diff) | |
| parent | e72c751e4d8100fb0068a34897b973ff3b5b7fd1 (diff) | |
| download | protobuf-66b074f4919d726b97023bc56a657f5676c76323.tar.gz protobuf-66b074f4919d726b97023bc56a657f5676c76323.tar.bz2 protobuf-66b074f4919d726b97023bc56a657f5676c76323.zip | |
Merge pull request #744 from xfxyjwf/cmake_linux
Fix cmake build on linux.
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc index 7840cfaf..b7b6039a 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc @@ -55,7 +55,9 @@ #include <google/protobuf/unittest.pb.h> #include <google/protobuf/unittest_optimize_for.pb.h> #include <google/protobuf/unittest_embed_optimize_for.pb.h> -#if !defined(_MSC_VER) // Too large for visual studio to compile +#if !defined(GOOGLE_PROTOBUF_CMAKE_BUILD) && !defined(_MSC_VER) +// We exclude this large proto from cmake build because it's too large for +// visual studio to compile (report internal errors). #include <google/protobuf/unittest_enormous_descriptor.pb.h> #endif #include <google/protobuf/unittest_no_generic_services.pb.h> @@ -135,7 +137,7 @@ TEST(GeneratedDescriptorTest, IdenticalDescriptors) { generated_decsriptor_proto.DebugString()); } -#if !defined(_MSC_VER) +#if !defined(GOOGLE_PROTOBUF_CMAKE_BUILD) && !defined(_MSC_VER) // Test that generated code has proper descriptors: // Touch a descriptor generated from an enormous message to validate special // handling for descriptors exceeding the C++ standard's recommended minimum |