diff options
author | Craig Tiller <ctiller@google.com> | 2016-11-04 15:19:43 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-11-04 15:19:43 -0700 |
commit | 56fa2c6b564d5b11139b4e5539277ec753561e0f (patch) | |
tree | d50519113bf2077d59a876afab23e83a2ed66d29 | |
parent | 503653e27ed882db1e8c134f9daca0bae451d325 (diff) |
Order files - things were making sanity sad
3 files changed, 18 insertions, 18 deletions
diff --git a/src/google_benchmark/gen_build_yaml.py b/src/google_benchmark/gen_build_yaml.py index f3b3f46132..bfdbf40db9 100755 --- a/src/google_benchmark/gen_build_yaml.py +++ b/src/google_benchmark/gen_build_yaml.py @@ -44,8 +44,8 @@ out['libs'] = [{ '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 b0c8d07b23..52774e0802 100644 --- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj +++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj @@ -147,6 +147,10 @@ </ItemDefinitionGroup> <ItemGroup> + <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" /> @@ -163,10 +167,6 @@ <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" /> - <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" /> </ItemGroup> <ItemGroup> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc"> diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters index 6768675b3c..9db6ed4657 100644 --- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters +++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters @@ -42,6 +42,18 @@ </ClCompile> </ItemGroup> <ItemGroup> + <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\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> @@ -90,18 +102,6 @@ <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\include\benchmark\benchmark.h"> - <Filter>third_party\google_benchmark\include\benchmark</Filter> - </ClInclude> - <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> </ItemGroup> <ItemGroup> |