From 46bd60b92f593a62e150c93cb8761148f6830b47 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Mon, 27 Apr 2015 17:44:45 -0700 Subject: Modify directory to use in test Change-Id: Iede1dc4e70427663e0d3c5304fa86b3aebf492b7 --- src/google/protobuf/testing/googletest.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/google/protobuf/testing') diff --git a/src/google/protobuf/testing/googletest.cc b/src/google/protobuf/testing/googletest.cc index d72fa5c0..5f6a199a 100644 --- a/src/google/protobuf/testing/googletest.cc +++ b/src/google/protobuf/testing/googletest.cc @@ -65,6 +65,7 @@ namespace protobuf { #endif string TestSourceDir() { +#ifndef GOOGLE_THIRD_PARTY_PROTOBUF #ifdef _MSC_VER // Look for the "src" directory. string prefix = "."; @@ -88,6 +89,9 @@ string TestSourceDir() { return result; } #endif +#else + return "third_party/protobuf/src"; +#endif // GOOGLE_THIRD_PARTY_PROTOBUF } namespace { -- cgit v1.2.3