summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'vendor')
-rw-r--r--vendor/benchmark.cmake27
-rw-r--r--vendor/boost.cmake9
-rw-r--r--vendor/cheap-ruler-cpp.cmake10
-rw-r--r--vendor/earcut.hpp.cmake9
-rw-r--r--vendor/eternal.cmake9
-rw-r--r--vendor/geojson-vt-cpp.cmake9
-rw-r--r--vendor/glfw.cmake12
-rw-r--r--vendor/googletest.cmake24
-rw-r--r--vendor/icu.cmake31
-rw-r--r--vendor/nunicode.cmake17
-rw-r--r--vendor/polylabel.cmake9
-rw-r--r--vendor/protozero.cmake9
-rw-r--r--vendor/shelf-pack-cpp.cmake9
-rw-r--r--vendor/sqlite.cmake19
-rw-r--r--vendor/unique_resource.cmake9
-rw-r--r--vendor/vector-tile.cmake9
-rw-r--r--vendor/wagyu.cmake9
17 files changed, 139 insertions, 91 deletions
diff --git a/vendor/benchmark.cmake b/vendor/benchmark.cmake
index 44c0672971..075bcf4a18 100644
--- a/vendor/benchmark.cmake
+++ b/vendor/benchmark.cmake
@@ -2,30 +2,33 @@ if(TARGET mbgl-vendor-benchmark)
return()
endif()
-add_library(mbgl-vendor-benchmark STATIC EXCLUDE_FROM_ALL
+add_library(
+ mbgl-vendor-benchmark STATIC EXCLUDE_FROM_ALL
+ ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/benchmark.cc
+ ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/benchmark_register.cc
+ ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/colorprint.cc
${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/console_reporter.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/csv_reporter.cc
${CMAKE_CURRENT_LIST_DIR}/benchmark/src/json_reporter.cc
${CMAKE_CURRENT_LIST_DIR}/benchmark/src/reporter.cc
+ ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/sleep.cc
+ ${CMAKE_CURRENT_LIST_DIR}/benchmark/src/statistics.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(mbgl-vendor-benchmark PRIVATE
- HAVE_STEADY_CLOCK
+target_compile_definitions(
+ mbgl-vendor-benchmark
+ PRIVATE HAVE_STEADY_CLOCK
)
-target_include_directories(mbgl-vendor-benchmark SYSTEM PUBLIC
- ${CMAKE_CURRENT_LIST_DIR}/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)
diff --git a/vendor/boost.cmake b/vendor/boost.cmake
index 33b203368e..ad2ba24e5c 100644
--- a/vendor/boost.cmake
+++ b/vendor/boost.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-boost)
return()
endif()
-add_library(mbgl-vendor-boost INTERFACE)
+add_library(
+ mbgl-vendor-boost INTERFACE
+)
-target_include_directories(mbgl-vendor-boost SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/boost/include
+target_include_directories(
+ mbgl-vendor-boost SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/boost/include
)
diff --git a/vendor/cheap-ruler-cpp.cmake b/vendor/cheap-ruler-cpp.cmake
index 741a7b2ec2..7fa21eb69e 100644
--- a/vendor/cheap-ruler-cpp.cmake
+++ b/vendor/cheap-ruler-cpp.cmake
@@ -2,9 +2,11 @@ if(TARGET mbgl-vendor-cheap-ruler-cpp)
return()
endif()
-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
+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
+)
diff --git a/vendor/earcut.hpp.cmake b/vendor/earcut.hpp.cmake
index e5459f16ce..1f0ad2be6b 100644
--- a/vendor/earcut.hpp.cmake
+++ b/vendor/earcut.hpp.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-earcut.hpp)
return()
endif()
-add_library(mbgl-vendor-earcut.hpp INTERFACE)
+add_library(
+ mbgl-vendor-earcut.hpp INTERFACE
+)
-target_include_directories(mbgl-vendor-earcut.hpp SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/earcut.hpp/include
+target_include_directories(
+ mbgl-vendor-earcut.hpp SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/earcut.hpp/include
)
diff --git a/vendor/eternal.cmake b/vendor/eternal.cmake
index 5a429db4fa..13a9d2533f 100644
--- a/vendor/eternal.cmake
+++ b/vendor/eternal.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-eternal)
return()
endif()
-add_library(mbgl-vendor-eternal INTERFACE)
+add_library(
+ mbgl-vendor-eternal INTERFACE
+)
-target_include_directories(mbgl-vendor-eternal SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/eternal/include
+target_include_directories(
+ mbgl-vendor-eternal SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/eternal/include
)
diff --git a/vendor/geojson-vt-cpp.cmake b/vendor/geojson-vt-cpp.cmake
index f2646336b3..60afe5613d 100644
--- a/vendor/geojson-vt-cpp.cmake
+++ b/vendor/geojson-vt-cpp.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-geojson-vt-cpp)
return()
endif()
-add_library(mbgl-vendor-geojson-vt-cpp INTERFACE)
+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
+target_include_directories(
+ mbgl-vendor-geojson-vt-cpp SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/geojson-vt-cpp/include
)
diff --git a/vendor/glfw.cmake b/vendor/glfw.cmake
index e99ecc86b1..2a554df731 100644
--- a/vendor/glfw.cmake
+++ b/vendor/glfw.cmake
@@ -7,14 +7,20 @@ unset(CMAKE_C_VISIBILITY_PRESET)
add_subdirectory(vendor/glfw)
set(CMAKE_C_VISIBILITY_PRESET hidden)
-target_compile_options(glfw PRIVATE -Wno-shadow -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers)
+target_compile_options(
+ glfw
+ PRIVATE
+ -Wno-shadow
+ -Wno-unused-parameter
+ -Wno-sign-compare
+ -Wno-missing-field-initializers
+)
if(APPLE)
# Don't show OpenGL deprecation warnings.
target_compile_options(glfw PRIVATE -Wno-deprecated-declarations -Wno-unguarded-availability-new)
- # get_target_property(DEPLOYMENT_TARGET_VERSION glfw MACOSX_DEPLOYMENT_TARGET)
- # message(STATUS "target: ${DEPLOYMENT_TARGET_VERSION}")
+ # get_target_property(DEPLOYMENT_TARGET_VERSION glfw MACOSX_DEPLOYMENT_TARGET) message(STATUS "target: ${DEPLOYMENT_TARGET_VERSION}")
set_target_properties(glfw PROPERTIES OSX_DEPLOYMENT_TARGET 10.11)
endif()
diff --git a/vendor/googletest.cmake b/vendor/googletest.cmake
index 4ae0afddb5..5d475dd633 100644
--- a/vendor/googletest.cmake
+++ b/vendor/googletest.cmake
@@ -2,21 +2,23 @@ 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
+add_library(
+ mbgl-vendor-googletest STATIC EXCLUDE_FROM_ALL
+ ${CMAKE_CURRENT_LIST_DIR}/googletest/googlemock/src/gmock-all.cc ${CMAKE_CURRENT_LIST_DIR}/googletest/googletest/src/gtest-all.cc
)
-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(
+ 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(mbgl-vendor-googletest SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/googletest/googletest/include
- ${CMAKE_CURRENT_LIST_DIR}/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)
diff --git a/vendor/icu.cmake b/vendor/icu.cmake
index c3a05fe44b..0ae1593e5e 100644
--- a/vendor/icu.cmake
+++ b/vendor/icu.cmake
@@ -2,7 +2,8 @@ if(TARGET mbgl-vendor-icu)
return()
endif()
-add_library(mbgl-vendor-icu STATIC
+add_library(
+ mbgl-vendor-icu STATIC
${CMAKE_CURRENT_LIST_DIR}/icu/src/cmemory.cpp
${CMAKE_CURRENT_LIST_DIR}/icu/src/cstring.cpp
${CMAKE_CURRENT_LIST_DIR}/icu/src/ubidi.cpp
@@ -20,23 +21,23 @@ add_library(mbgl-vendor-icu STATIC
${CMAKE_CURRENT_LIST_DIR}/icu/src/utypes.cpp
)
-target_compile_definitions(mbgl-vendor-icu PRIVATE
- UCONFIG_NO_BREAK_ITERATION=1
- UCONFIG_NO_LEGACY_CONVERSION=1
- U_CHARSET_IS_UTF8=1
- U_CHAR_TYPE=uint_least16_t
- U_HAVE_ATOMIC=1
- U_HAVE_STRTOD_L=0
- _REENTRANT
+target_compile_definitions(
+ mbgl-vendor-icu
+ PRIVATE
+ UCONFIG_NO_BREAK_ITERATION=1
+ UCONFIG_NO_LEGACY_CONVERSION=1
+ U_CHARSET_IS_UTF8=1
+ U_CHAR_TYPE=uint_least16_t
+ U_HAVE_ATOMIC=1
+ U_HAVE_STRTOD_L=0
+ _REENTRANT
)
-target_compile_options(mbgl-vendor-icu PRIVATE
- -Wno-error
- -Wno-shorten-64-to-32
-)
+target_compile_options(mbgl-vendor-icu PRIVATE -Wno-error -Wno-shorten-64-to-32)
-target_include_directories(mbgl-vendor-icu SYSTEM PUBLIC
- ${CMAKE_CURRENT_LIST_DIR}/icu/include
+target_include_directories(
+ mbgl-vendor-icu SYSTEM
+ PUBLIC ${CMAKE_CURRENT_LIST_DIR}/icu/include
)
set_property(TARGET mbgl-vendor-icu PROPERTY FOLDER Core)
diff --git a/vendor/nunicode.cmake b/vendor/nunicode.cmake
index 0a310a7bea..f13492de78 100644
--- a/vendor/nunicode.cmake
+++ b/vendor/nunicode.cmake
@@ -2,7 +2,8 @@ if(TARGET mbgl-vendor-nunicode)
return()
endif()
-add_library(mbgl-vendor-nunicode STATIC
+add_library(
+ mbgl-vendor-nunicode STATIC
${CMAKE_CURRENT_LIST_DIR}/nunicode/src/libnu/ducet.c
${CMAKE_CURRENT_LIST_DIR}/nunicode/src/libnu/strcoll.c
${CMAKE_CURRENT_LIST_DIR}/nunicode/src/libnu/strings.c
@@ -12,14 +13,14 @@ add_library(mbgl-vendor-nunicode STATIC
${CMAKE_CURRENT_LIST_DIR}/nunicode/src/libnu/utf8.c
)
-target_compile_definitions(mbgl-vendor-nunicode PRIVATE
- NU_BUILD_STATIC
+target_compile_definitions(
+ mbgl-vendor-nunicode
+ PRIVATE NU_BUILD_STATIC
)
-target_compile_options(mbgl-vendor-nunicode PRIVATE
- -Wno-error
-)
+target_compile_options(mbgl-vendor-nunicode PRIVATE -Wno-error)
-target_include_directories(mbgl-vendor-nunicode SYSTEM PUBLIC
- ${CMAKE_CURRENT_LIST_DIR}/nunicode/include
+target_include_directories(
+ mbgl-vendor-nunicode SYSTEM
+ PUBLIC ${CMAKE_CURRENT_LIST_DIR}/nunicode/include
)
diff --git a/vendor/polylabel.cmake b/vendor/polylabel.cmake
index 5a930c9f6d..db5389b993 100644
--- a/vendor/polylabel.cmake
+++ b/vendor/polylabel.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-polylabel)
return()
endif()
-add_library(mbgl-vendor-polylabel INTERFACE)
+add_library(
+ mbgl-vendor-polylabel INTERFACE
+)
-target_include_directories(mbgl-vendor-polylabel SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/polylabel/include
+target_include_directories(
+ mbgl-vendor-polylabel SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/polylabel/include
)
diff --git a/vendor/protozero.cmake b/vendor/protozero.cmake
index 41af37f188..8558645ed8 100644
--- a/vendor/protozero.cmake
+++ b/vendor/protozero.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-protozero)
return()
endif()
-add_library(mbgl-vendor-protozero INTERFACE)
+add_library(
+ mbgl-vendor-protozero INTERFACE
+)
-target_include_directories(mbgl-vendor-protozero SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/protozero/include
+target_include_directories(
+ mbgl-vendor-protozero SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/protozero/include
)
diff --git a/vendor/shelf-pack-cpp.cmake b/vendor/shelf-pack-cpp.cmake
index bf2e07c22f..5b0cf01e5e 100644
--- a/vendor/shelf-pack-cpp.cmake
+++ b/vendor/shelf-pack-cpp.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-shelf-pack-cpp)
return()
endif()
-add_library(mbgl-vendor-shelf-pack-cpp INTERFACE)
+add_library(
+ mbgl-vendor-shelf-pack-cpp INTERFACE
+)
-target_include_directories(mbgl-vendor-shelf-pack-cpp SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/shelf-pack-cpp/include
+target_include_directories(
+ mbgl-vendor-shelf-pack-cpp SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/shelf-pack-cpp/include
)
diff --git a/vendor/sqlite.cmake b/vendor/sqlite.cmake
index d01ac0dd4e..b010e0c78a 100644
--- a/vendor/sqlite.cmake
+++ b/vendor/sqlite.cmake
@@ -2,7 +2,8 @@ if(TARGET mbgl-vendor-sqlite)
return()
endif()
-add_library(mbgl-vendor-sqlite STATIC
+add_library(
+ mbgl-vendor-sqlite STATIC
${CMAKE_CURRENT_LIST_DIR}/sqlite/src/sqlite3.c
)
@@ -10,17 +11,19 @@ include(CheckSymbolExists)
check_symbol_exists("strerror_r" "string.h" MBGL_SQLITE3_HAVE_STRERROR_R)
if(MBGL_SQLITE3_HAVE_STRERROR_R)
- target_compile_definitions(mbgl-vendor-sqlite PRIVATE
- HAVE_STRERROR_R
+ target_compile_definitions(
+ mbgl-vendor-sqlite
+ PRIVATE HAVE_STRERROR_R
)
endif()
# So we don't need to link with -ldl
-target_compile_definitions(mbgl-vendor-sqlite PRIVATE
- SQLITE_OMIT_LOAD_EXTENSION
- SQLITE_THREADSAFE
+target_compile_definitions(
+ mbgl-vendor-sqlite
+ PRIVATE SQLITE_OMIT_LOAD_EXTENSION SQLITE_THREADSAFE
)
-target_include_directories(mbgl-vendor-sqlite SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/sqlite/include
+target_include_directories(
+ mbgl-vendor-sqlite SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/sqlite/include
)
diff --git a/vendor/unique_resource.cmake b/vendor/unique_resource.cmake
index 02fed9cbc1..71f514d8e5 100644
--- a/vendor/unique_resource.cmake
+++ b/vendor/unique_resource.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-unique_resource)
return()
endif()
-add_library(mbgl-vendor-unique_resource INTERFACE)
+add_library(
+ mbgl-vendor-unique_resource INTERFACE
+)
-target_include_directories(mbgl-vendor-unique_resource SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/unique_resource
+target_include_directories(
+ mbgl-vendor-unique_resource SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/unique_resource
)
diff --git a/vendor/vector-tile.cmake b/vendor/vector-tile.cmake
index 5f31fae94c..5352b8e1b3 100644
--- a/vendor/vector-tile.cmake
+++ b/vendor/vector-tile.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-vector-tile)
return()
endif()
-add_library(mbgl-vendor-vector-tile INTERFACE)
+add_library(
+ mbgl-vendor-vector-tile INTERFACE
+)
-target_include_directories(mbgl-vendor-vector-tile SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/vector-tile/include
+target_include_directories(
+ mbgl-vendor-vector-tile SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/vector-tile/include
)
diff --git a/vendor/wagyu.cmake b/vendor/wagyu.cmake
index 15f0758fb8..6abdcaad2d 100644
--- a/vendor/wagyu.cmake
+++ b/vendor/wagyu.cmake
@@ -2,8 +2,11 @@ if(TARGET mbgl-vendor-wagyu)
return()
endif()
-add_library(mbgl-vendor-wagyu INTERFACE)
+add_library(
+ mbgl-vendor-wagyu INTERFACE
+)
-target_include_directories(mbgl-vendor-wagyu SYSTEM INTERFACE
- ${CMAKE_CURRENT_LIST_DIR}/wagyu/include
+target_include_directories(
+ mbgl-vendor-wagyu SYSTEM
+ INTERFACE ${CMAKE_CURRENT_LIST_DIR}/wagyu/include
)