Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8950 from grpc/revert-8851-rename_gbench

Browse Source 
Revert "Renamed google_benchmark submodule to benchmark"
pull/8952/head
Mark D. Roth 8 years ago committed by GitHub
parent adc3fbc0a3 d101e14211
commit 56b655c580
11 changed files with 149 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitmodules
  2. 28
      Makefile
  3. 2
      build.yaml
  4. 6
      src/google_benchmark/gen_build_yaml.py
  5. 2
      test/cpp/microbenchmarks/bm_fullstack.cc
  6. 2
      test/cpp/microbenchmarks/noop-benchmark.cc
  7. 0
      third_party/google_benchmark
  8. 2
      tools/run_tests/sanity/check_submodules.sh
  9. 40
      tools/run_tests/sources_and_headers.json
  10. 66
      vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
  11. 148
      vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters

2
.gitmodules vendored
Unescape View File

@ -18,5 +18,5 @@
path = third_party/thrift path = third_party/thrift
url = https://github.com/apache/thrift.git url = https://github.com/apache/thrift.git
[submodule "third_party/google_benchmark"] [submodule "third_party/google_benchmark"]
path = third_party/benchmark path = third_party/google_benchmark
url = https://github.com/google/benchmark url = https://github.com/google/benchmark

28
Makefile
Unescape View File

@ -7008,25 +7008,25 @@ endif
LIBGOOGLE_BENCHMARK_SRC = \ LIBGOOGLE_BENCHMARK_SRC = \
third_party/benchmark/src/benchmark.cc \ third_party/google_benchmark/src/benchmark.cc \
third_party/benchmark/src/benchmark_register.cc \ third_party/google_benchmark/src/benchmark_register.cc \
third_party/benchmark/src/colorprint.cc \ third_party/google_benchmark/src/colorprint.cc \
third_party/benchmark/src/commandlineflags.cc \ third_party/google_benchmark/src/commandlineflags.cc \
third_party/benchmark/src/complexity.cc \ third_party/google_benchmark/src/complexity.cc \
third_party/benchmark/src/console_reporter.cc \ third_party/google_benchmark/src/console_reporter.cc \
third_party/benchmark/src/csv_reporter.cc \ third_party/google_benchmark/src/csv_reporter.cc \
third_party/benchmark/src/json_reporter.cc \ third_party/google_benchmark/src/json_reporter.cc \
third_party/benchmark/src/reporter.cc \ third_party/google_benchmark/src/reporter.cc \
third_party/benchmark/src/sleep.cc \ third_party/google_benchmark/src/sleep.cc \
third_party/benchmark/src/string_util.cc \ third_party/google_benchmark/src/string_util.cc \
third_party/benchmark/src/sysinfo.cc \ third_party/google_benchmark/src/sysinfo.cc \
third_party/benchmark/src/timers.cc \ third_party/google_benchmark/src/timers.cc \
PUBLIC_HEADERS_CXX += \ PUBLIC_HEADERS_CXX += \
LIBGOOGLE_BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGOOGLE_BENCHMARK_SRC)))) LIBGOOGLE_BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGOOGLE_BENCHMARK_SRC))))
$(LIBGOOGLE_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX $(LIBGOOGLE_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/google_benchmark/include -DHAVE_POSIX_REGEX
ifeq ($(NO_PROTOBUF),true) ifeq ($(NO_PROTOBUF),true)

2
build.yaml
Unescape View File

@ -3796,7 +3796,7 @@ defaults:
CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
LDFLAGS: -g LDFLAGS: -g
google_benchmark: google_benchmark:
CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX CPPFLAGS: -Ithird_party/google_benchmark/include -DHAVE_POSIX_REGEX
zlib: zlib:
CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration
$(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden

6
src/google_benchmark/gen_build_yaml.py
Unescape View File

@ -44,10 +44,10 @@ out['libs'] = [{
'language': 'c++', 'language': 'c++',
'secure': 'no', 'secure': 'no',
'defaults': 'google_benchmark', 'defaults': 'google_benchmark',
'src': sorted(glob.glob('third_party/benchmark/src/*.cc')), 'src': sorted(glob.glob('third_party/google_benchmark/src/*.cc')),
'headers': sorted( 'headers': sorted(
glob.glob('third_party/benchmark/src/*.h') + glob.glob('third_party/google_benchmark/src/*.h') +
glob.glob('third_party/benchmark/include/benchmark/*.h')), glob.glob('third_party/google_benchmark/include/benchmark/*.h')),
}] }]
print yaml.dump(out) print yaml.dump(out)

2
test/cpp/microbenchmarks/bm_fullstack.cc
Unescape View File

@ -59,7 +59,7 @@ extern "C" {
} }
#include "src/cpp/client/create_channel_internal.h" #include "src/cpp/client/create_channel_internal.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h"
#include "third_party/benchmark/include/benchmark/benchmark.h" #include "third_party/google_benchmark/include/benchmark/benchmark.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {

2
test/cpp/microbenchmarks/noop-benchmark.cc
Unescape View File

@ -34,7 +34,7 @@
/* This benchmark exists to ensure that the google_benchmark integration is /* This benchmark exists to ensure that the google_benchmark integration is
* working */ * working */
#include "third_party/benchmark/include/benchmark/benchmark.h" #include "third_party/google_benchmark/include/benchmark/benchmark.h"
static void BM_NoOp(benchmark::State& state) { static void BM_NoOp(benchmark::State& state) {
while (state.KeepRunning()) { while (state.KeepRunning()) {

0
third_party/benchmark → third_party/google_benchmark vendored
Unescape View File

2
tools/run_tests/sanity/check_submodules.sh
Unescape View File

@ -43,7 +43,7 @@ git submodule | awk '{ print $1 }' | sort > $submodules
cat << EOF | awk '{ print $1 }' | sort > $want_submodules cat << EOF | awk '{ print $1 }' | sort > $want_submodules
c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9 third_party/boringssl (version_for_cocoapods_2.0-100-gc880e42) c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9 third_party/boringssl (version_for_cocoapods_2.0-100-gc880e42)
05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
44c25c892a6229b20db7cd9dc05584ea865896de third_party/benchmark (v0.1.0-343-g44c25c8) 44c25c892a6229b20db7cd9dc05584ea865896de third_party/google_benchmark (v0.1.0-343-g44c25c8)
c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0) c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
a428e42072765993ff674fda72863c9f1aa2d268 third_party/protobuf (v3.1.0) a428e42072765993ff674fda72863c9f1aa2d268 third_party/protobuf (v3.1.0)
50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)

40
tools/run_tests/sources_and_headers.json
Unescape View File

@ -6207,26 +6207,26 @@
{ {
"deps": [], "deps": [],
"headers": [ "headers": [
"third_party/benchmark/include/benchmark/benchmark.h", "third_party/google_benchmark/include/benchmark/benchmark.h",
"third_party/benchmark/include/benchmark/benchmark_api.h", "third_party/google_benchmark/include/benchmark/benchmark_api.h",
"third_party/benchmark/include/benchmark/macros.h", "third_party/google_benchmark/include/benchmark/macros.h",
"third_party/benchmark/include/benchmark/reporter.h", "third_party/google_benchmark/include/benchmark/reporter.h",
"third_party/benchmark/src/arraysize.h", "third_party/google_benchmark/src/arraysize.h",
"third_party/benchmark/src/benchmark_api_internal.h", "third_party/google_benchmark/src/benchmark_api_internal.h",
"third_party/benchmark/src/check.h", "third_party/google_benchmark/src/check.h",
"third_party/benchmark/src/colorprint.h", "third_party/google_benchmark/src/colorprint.h",
"third_party/benchmark/src/commandlineflags.h", "third_party/google_benchmark/src/commandlineflags.h",
"third_party/benchmark/src/complexity.h", "third_party/google_benchmark/src/complexity.h",
"third_party/benchmark/src/cycleclock.h", "third_party/google_benchmark/src/cycleclock.h",
"third_party/benchmark/src/internal_macros.h", "third_party/google_benchmark/src/internal_macros.h",
"third_party/benchmark/src/log.h", "third_party/google_benchmark/src/log.h",
"third_party/benchmark/src/mutex.h", "third_party/google_benchmark/src/mutex.h",
"third_party/benchmark/src/re.h", "third_party/google_benchmark/src/re.h",
"third_party/benchmark/src/sleep.h", "third_party/google_benchmark/src/sleep.h",
"third_party/benchmark/src/stat.h", "third_party/google_benchmark/src/stat.h",
"third_party/benchmark/src/string_util.h", "third_party/google_benchmark/src/string_util.h",
"third_party/benchmark/src/sysinfo.h", "third_party/google_benchmark/src/sysinfo.h",
"third_party/benchmark/src/timers.h" "third_party/google_benchmark/src/timers.h"
], ],
"is_filegroup": false, "is_filegroup": false,
"language": "c++", "language": "c++",

66
vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
Unescape View File

@ -147,53 +147,53 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark_api.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\macros.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\reporter.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\arraysize.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_api_internal.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\check.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\cycleclock.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\internal_macros.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\log.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\mutex.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\re.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\stat.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\timers.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_register.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\console_reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\csv_reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\json_reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\timers.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

148
vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
Unescape View File

@ -1,106 +1,106 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_register.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\console_reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\csv_reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\json_reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\reporter.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\timers.cc"> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h">
<Filter>third_party\benchmark\include\benchmark</Filter> <Filter>third_party\google_benchmark\include\benchmark</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark_api.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h">
<Filter>third_party\benchmark\include\benchmark</Filter> <Filter>third_party\google_benchmark\include\benchmark</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\macros.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h">
<Filter>third_party\benchmark\include\benchmark</Filter> <Filter>third_party\google_benchmark\include\benchmark</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\reporter.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h">
<Filter>third_party\benchmark\include\benchmark</Filter> <Filter>third_party\google_benchmark\include\benchmark</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\arraysize.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_api_internal.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\check.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\cycleclock.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\internal_macros.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\log.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\mutex.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\re.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\stat.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\timers.h"> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h">
<Filter>third_party\benchmark\src</Filter> <Filter>third_party\google_benchmark\src</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@ -108,17 +108,17 @@
<Filter Include="third_party"> <Filter Include="third_party">
<UniqueIdentifier>{7458b63d-7ba4-103d-2bed-3e3ad30d8237}</UniqueIdentifier> <UniqueIdentifier>{7458b63d-7ba4-103d-2bed-3e3ad30d8237}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third_party\benchmark"> <Filter Include="third_party\google_benchmark">
<UniqueIdentifier>{3111b1b0-21cd-89e5-1dde-68eee22f75d8}</UniqueIdentifier> <UniqueIdentifier>{54a154e8-669b-a7c1-9b6e-bd1aab2f86e3}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third_party\benchmark\include"> <Filter Include="third_party\google_benchmark\include">
<UniqueIdentifier>{045f2c9f-39a8-d548-4596-2b82a180314a}</UniqueIdentifier> <UniqueIdentifier>{f54c3cb1-ec20-a651-6956-78379b51e1a5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third_party\benchmark\include\benchmark"> <Filter Include="third_party\google_benchmark\include\benchmark">
<UniqueIdentifier>{dcedff65-88c1-3daa-2a2e-25911e9c9752}</UniqueIdentifier> <UniqueIdentifier>{0483a457-8050-4565-bc15-09695bf7b822}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third_party\benchmark\src"> <Filter Include="third_party\google_benchmark\src">
<UniqueIdentifier>{d3343091-ae27-29e9-3c59-09b21561282c}</UniqueIdentifier> <UniqueIdentifier>{c39ff2d1-691e-4614-4d75-4bc20db05e09}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

Write Preview
Loading…
Cancel
Save