Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[build] generate header maps instead of -files.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
kkaefer committed Dec 17, 2018
1 parent a0da6e5 commit e4d360e
Show file tree
Hide file tree
Showing 92 changed files with 6,773 additions and 7,713 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ buck-out
mapbox-gl-native.code-workspace

# Generated list files from code generation
/scripts/generate-cmake-files.list
/scripts/generate-file-lists.list
/scripts/generate-shaders.list
/scripts/generate-style-code.list
23 changes: 23 additions & 0 deletions benchmark/benchmark-files.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
"sources": [
"benchmark/api/query.benchmark.cpp",
"benchmark/api/render.benchmark.cpp",
"benchmark/function/camera_function.benchmark.cpp",
"benchmark/function/composite_function.benchmark.cpp",
"benchmark/function/source_function.benchmark.cpp",
"benchmark/parse/filter.benchmark.cpp",
"benchmark/parse/tile_mask.benchmark.cpp",
"benchmark/parse/vector_tile.benchmark.cpp",
"benchmark/src/main.cpp",
"benchmark/src/mbgl/benchmark/benchmark.cpp",
"benchmark/util/dtoa.benchmark.cpp",
"benchmark/util/tilecover.benchmark.cpp"
],
"public_headers": {
"mbgl/benchmark.hpp": "benchmark/include/mbgl/benchmark.hpp"
},
"private_headers": {
"mbgl/benchmark/stub_geometry_tile_feature.hpp": "benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp"
}
}
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ jobs:
command: scripts/nitpick/submodule-pin.js
when: always
- run:
name: CMake file list generation
command: scripts/nitpick/generated-code.js cmake
name: Source file list generation
command: scripts/nitpick/generated-code.js sources
when: always
- run:
name: Shader code generation
Expand Down
25 changes: 0 additions & 25 deletions cmake/benchmark-files.txt

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/benchmark.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Modify cmake/benchmark-files.txt to change the source files for this target.
load_sources_list(MBGL_BENCHMARK_FILES cmake/benchmark-files.txt)
# Run scripts/generate-file-lists.js to change the source files for this target.
load_sources_list(MBGL_BENCHMARK_FILES benchmark/benchmark-files.json)
add_executable(mbgl-benchmark ${MBGL_BENCHMARK_FILES})

target_include_directories(mbgl-benchmark
Expand Down
Loading

0 comments on commit e4d360e

Please sign in to comment.