diff options
| -rw-r--r-- | src/build/testing.gyp (renamed from src/build/testing.gypi) | 20 | ||||
| -rw-r--r-- | src/common/common.gyp | 6 | ||||
| -rw-r--r-- | src/processor/processor.gyp | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/build/testing.gypi b/src/build/testing.gyp index 3a77230a..6a459a64 100644 --- a/src/build/testing.gypi +++ b/src/build/testing.gyp @@ -32,15 +32,15 @@ 'target_name': 'gtest', 'type': 'static_library', 'sources': [ - '../testing/gtest/src/gtest-all.cc', + '../testing/googletest/src/gtest-all.cc', ], 'include_dirs': [ - '../testing/gtest', - '../testing/gtest/include', + '../testing/googletest', + '../testing/googletest/include', ], 'direct_dependent_settings': { 'include_dirs': [ - '../testing/gtest/include', + '../testing/googletest/include', ], }, }, @@ -51,7 +51,7 @@ 'gtest', ], 'sources': [ - 'gtest/src/gtest_main.cc', + '../testing/googletest/src/gtest_main.cc', ], }, { @@ -61,15 +61,15 @@ 'gtest', ], 'sources': [ - '../testing/src/gmock-all.cc', + '../testing/googlemock/src/gmock-all.cc', ], 'include_dirs': [ - '../testing', - '../testing/include', + '../testing/googlemock', + '../testing/googlemock/include', ], 'direct_dependent_settings': { 'include_dirs': [ - '../testing/include', + '../testing/googlemock/include', ], }, 'export_dependent_settings': [ @@ -83,7 +83,7 @@ 'gmock', ], 'sources': [ - '../testing/src/gmock_main.cc', + '../testing/googlemock/src/gmock_main.cc', ], }, ], diff --git a/src/common/common.gyp b/src/common/common.gyp index 08772bf7..1c97bfc9 100644 --- a/src/common/common.gyp +++ b/src/common/common.gyp @@ -238,9 +238,9 @@ ], 'dependencies': [ 'common', - '../build/testing.gypi:gmock_main', - '../build/testing.gypi:gmock', - '../build/testing.gypi:gtest', + '../build/testing.gyp:gmock_main', + '../build/testing.gyp:gmock', + '../build/testing.gyp:gtest', ], 'libraries': [ '-ldl', diff --git a/src/processor/processor.gyp b/src/processor/processor.gyp index 083a3237..d09a8953 100644 --- a/src/processor/processor.gyp +++ b/src/processor/processor.gyp @@ -176,8 +176,8 @@ ], 'dependencies': [ 'processor', - '../build/testing.gypi:gmock', - '../build/testing.gypi:gtest', + '../build/testing.gyp:gmock', + '../build/testing.gyp:gtest', ], }, ], |