Merge branch 'sane' into decouple_version_number
diff --git a/Makefile b/Makefile
index 5e860ec..a6f7e68 100644
--- a/Makefile
+++ b/Makefile
@@ -6770,19 +6770,19 @@
LIBGOOGLE_BENCHMARK_SRC = \
- third_party/google_benchmark/src/benchmark_register.cc \
- third_party/google_benchmark/src/json_reporter.cc \
- third_party/google_benchmark/src/string_util.cc \
- third_party/google_benchmark/src/console_reporter.cc \
- third_party/google_benchmark/src/reporter.cc \
- third_party/google_benchmark/src/timers.cc \
- third_party/google_benchmark/src/commandlineflags.cc \
- third_party/google_benchmark/src/csv_reporter.cc \
- third_party/google_benchmark/src/complexity.cc \
third_party/google_benchmark/src/benchmark.cc \
+ third_party/google_benchmark/src/benchmark_register.cc \
third_party/google_benchmark/src/colorprint.cc \
+ third_party/google_benchmark/src/commandlineflags.cc \
+ third_party/google_benchmark/src/complexity.cc \
+ third_party/google_benchmark/src/console_reporter.cc \
+ third_party/google_benchmark/src/csv_reporter.cc \
+ third_party/google_benchmark/src/json_reporter.cc \
+ third_party/google_benchmark/src/reporter.cc \
third_party/google_benchmark/src/sleep.cc \
+ third_party/google_benchmark/src/string_util.cc \
third_party/google_benchmark/src/sysinfo.cc \
+ third_party/google_benchmark/src/timers.cc \
PUBLIC_HEADERS_CXX += \
diff --git a/src/google_benchmark/gen_build_yaml.py b/src/google_benchmark/gen_build_yaml.py
index f3b3f46..302e087 100755
--- a/src/google_benchmark/gen_build_yaml.py
+++ b/src/google_benchmark/gen_build_yaml.py
@@ -44,8 +44,10 @@
'language': 'c++',
'secure': 'no',
'defaults': 'google_benchmark',
- 'src': glob.glob('third_party/google_benchmark/src/*.cc'),
- 'headers': glob.glob('third_party/google_benchmark/src/*.h') + glob.glob('third_party/google_benchmark/include/benchmark/*.h'),
+ 'src': sorted(glob.glob('third_party/google_benchmark/src/*.cc')),
+ 'headers': sorted(
+ glob.glob('third_party/google_benchmark/src/*.h') +
+ glob.glob('third_party/google_benchmark/include/benchmark/*.h')),
}]
print yaml.dump(out)
diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
index 5de3625..52774e0 100644
--- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
+++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
@@ -147,54 +147,54 @@
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h" />
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h" />
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h" />
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
- </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc">
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
+ </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc">
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
+ </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc">
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
+ </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc">
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
+ </ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
index e278573..9db6ed4 100644
--- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
+++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
@@ -1,84 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc">
<Filter>third_party\google_benchmark\src</Filter>
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc">
<Filter>third_party\google_benchmark\src</Filter>
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc">
<Filter>third_party\google_benchmark\src</Filter>
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
<ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc">
<Filter>third_party\google_benchmark\src</Filter>
</ClCompile>
+ <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h">
- <Filter>third_party\google_benchmark\src</Filter>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h">
+ <Filter>third_party\google_benchmark\include\benchmark</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h">
- <Filter>third_party\google_benchmark\src</Filter>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h">
+ <Filter>third_party\google_benchmark\include\benchmark</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h">
+ <Filter>third_party\google_benchmark\include\benchmark</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h">
+ <Filter>third_party\google_benchmark\include\benchmark</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h">
<Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h">
<Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h">
- <Filter>third_party\google_benchmark\src</Filter>
- </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h">
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h">
<Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h">
@@ -87,20 +69,38 @@
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h">
<Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h">
+ <Filter>third_party\google_benchmark\src</Filter>
+ </ClInclude>
<ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h">
<Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h">
- <Filter>third_party\google_benchmark\include\benchmark</Filter>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h">
+ <Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h">
- <Filter>third_party\google_benchmark\include\benchmark</Filter>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h">
+ <Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h">
- <Filter>third_party\google_benchmark\include\benchmark</Filter>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h">
+ <Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h">
- <Filter>third_party\google_benchmark\include\benchmark</Filter>
+ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h">
+ <Filter>third_party\google_benchmark\src</Filter>
</ClInclude>
</ItemGroup>