forked from mapbox/mapbox-gl-native
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[build] Cosmetics on vendor packages
- Add include guards on all the files - Add a vendor package for sqlite and gtest - Use relative paths to all the files
- Loading branch information
Showing
28 changed files
with
229 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,31 @@ | ||
| add_library(benchmark STATIC | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/commandlineflags.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/console_reporter.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/complexity.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/csv_reporter.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/colorprint.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/sleep.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/benchmark.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/counter.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/benchmark_register.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/statistics.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/json_reporter.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/reporter.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/string_util.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/sysinfo.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/src/timers.cc | ||
| if(TARGET mbgl-vendor-benchmark) | ||
| return() | ||
| endif() | ||
|
|
||
| add_library(mbgl-vendor-benchmark STATIC EXCLUDE_FROM_ALL | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/commandlineflags.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/console_reporter.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/complexity.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/csv_reporter.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/colorprint.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/sleep.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/benchmark.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/counter.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/benchmark_register.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/statistics.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/json_reporter.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/reporter.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/string_util.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/sysinfo.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/timers.cc | ||
| ) | ||
|
|
||
| target_compile_definitions(benchmark PRIVATE | ||
| target_compile_definitions(mbgl-vendor-benchmark PRIVATE | ||
| HAVE_STEADY_CLOCK | ||
| ) | ||
|
|
||
| target_include_directories(benchmark SYSTEM PUBLIC | ||
| ${CMAKE_SOURCE_DIR}/vendor/benchmark/include | ||
| target_include_directories(mbgl-vendor-benchmark SYSTEM PUBLIC | ||
| ${CMAKE_CURRENT_LIST_DIR}/benchmark/include | ||
| ) | ||
|
|
||
| set_property(TARGET mbgl-vendor-benchmark PROPERTY FOLDER Core) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| add_library(boost INTERFACE) | ||
| if(TARGET mbgl-vendor-boost) | ||
| return() | ||
| endif() | ||
|
|
||
| target_include_directories(boost SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/boost/include | ||
| add_library(mbgl-vendor-boost INTERFACE) | ||
|
|
||
| target_include_directories(mbgl-vendor-boost SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/boost/include | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| add_library(cheap-ruler-cpp INTERFACE) | ||
| if(TARGET mbgl-vendor-cheap-ruler-cpp) | ||
| return() | ||
| endif() | ||
|
|
||
| target_include_directories(cheap-ruler-cpp SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/cheap-ruler-cpp/include | ||
| add_library(mbgl-vendor-cheap-ruler-cpp INTERFACE) | ||
|
|
||
| target_include_directories(mbgl-vendor-cheap-ruler-cpp SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/cheap-ruler-cpp/include | ||
| ) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| add_library(earcut.hpp INTERFACE) | ||
| if(TARGET mbgl-vendor-earcut.hpp) | ||
| return() | ||
| endif() | ||
|
|
||
| target_include_directories(earcut.hpp SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/earcut.hpp/include | ||
| add_library(mbgl-vendor-earcut.hpp INTERFACE) | ||
|
|
||
| target_include_directories(mbgl-vendor-earcut.hpp SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/earcut.hpp/include | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| add_library(eternal INTERFACE) | ||
| if(TARGET mbgl-vendor-eternal) | ||
| return() | ||
| endif() | ||
|
|
||
| target_include_directories(eternal SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/eternal/include | ||
| add_library(mbgl-vendor-eternal INTERFACE) | ||
|
|
||
| target_include_directories(mbgl-vendor-eternal SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/eternal/include | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| add_library(expected INTERFACE) | ||
| if(TARGET mbgl-vendor-expected) | ||
| return() | ||
| endif() | ||
|
|
||
| target_include_directories(expected SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/expected/include | ||
| add_library(mbgl-vendor-expected INTERFACE) | ||
|
|
||
| target_include_directories(mbgl-vendor-expected SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/expected/include | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| add_library(geojson-vt-cpp INTERFACE) | ||
| if(TARGET mbgl-vendor-geojson-vt-cpp) | ||
| return() | ||
| endif() | ||
|
|
||
| target_include_directories(geojson-vt-cpp SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp/include | ||
| add_library(mbgl-vendor-geojson-vt-cpp INTERFACE) | ||
|
|
||
| target_include_directories(mbgl-vendor-geojson-vt-cpp SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/geojson-vt-cpp/include | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,22 @@ | ||
| add_library(googletest STATIC | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googletest/src/gtest-all.cc | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googlemock/src/gmock-all.cc | ||
| if(TARGET mbgl-vendor-googletest) | ||
| return() | ||
| endif() | ||
|
|
||
| add_library(mbgl-vendor-googletest STATIC EXCLUDE_FROM_ALL | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googletest/src/gtest-all.cc | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googlemock/src/gmock-all.cc | ||
| ) | ||
|
|
||
| target_include_directories(googletest PRIVATE | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googletest | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googletest/include | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googlemock | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googlemock/include | ||
| target_include_directories(mbgl-vendor-googletest PRIVATE | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googletest | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googletest/include | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googlemock | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googlemock/include | ||
| ) | ||
|
|
||
| target_include_directories(googletest SYSTEM INTERFACE | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googletest/include | ||
| ${CMAKE_SOURCE_DIR}/vendor/googletest/googlemock/include | ||
| target_include_directories(mbgl-vendor-googletest SYSTEM INTERFACE | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googletest/include | ||
| ${CMAKE_CURRENT_LIST_DIR}/googletest/googlemock/include | ||
| ) | ||
|
|
||
| set_property(TARGET mbgl-vendor-googletest PROPERTY FOLDER Core) |
Oops, something went wrong.