diff options
Diffstat (limited to 'vendor/mapbox-base.cmake')
| -rw-r--r-- | vendor/mapbox-base.cmake | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/vendor/mapbox-base.cmake b/vendor/mapbox-base.cmake index a9e8fc1787..70e13ce2fa 100644 --- a/vendor/mapbox-base.cmake +++ b/vendor/mapbox-base.cmake @@ -1,8 +1,7 @@ # License helper for mapbox-base, should be upstreamed. if(NOT TARGET mapbox-base) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mapbox-base/extras) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mapbox-base) endif() set_target_properties( @@ -29,7 +28,7 @@ set_target_properties( INTERFACE_MAPBOX_NAME "supercluster.hpp" INTERFACE_MAPBOX_URL "https://github.com/mapbox/supercluster.hpp" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/supercluster.hpp/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/supercluster.hpp/LICENSE ) set_target_properties( @@ -38,7 +37,7 @@ set_target_properties( INTERFACE_MAPBOX_NAME "shelf-pack-cpp" INTERFACE_MAPBOX_URL "https://github.com/mapbox/shelf-pack-cpp" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/shelf-pack-cpp/LICENSE.md + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/shelf-pack-cpp/LICENSE.md ) set_target_properties( @@ -47,7 +46,7 @@ set_target_properties( INTERFACE_MAPBOX_NAME "geojson-vt-cpp" INTERFACE_MAPBOX_URL "https://github.com/mapbox/geojson-vt-cpp" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/geojson-vt-cpp/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geojson-vt-cpp/LICENSE ) set_target_properties( @@ -65,7 +64,7 @@ set_target_properties( INTERFACE_MAPBOX_NAME "geojson.hpp" INTERFACE_MAPBOX_URL "https://github.com/mapbox/geojson-cpp" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/geojson.hpp/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geojson.hpp/LICENSE ) set_target_properties( @@ -74,7 +73,7 @@ set_target_properties( INTERFACE_MAPBOX_NAME "geometry.hpp" INTERFACE_MAPBOX_URL "https://github.com/mapbox/geometry.hpp" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/geometry.hpp/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geometry.hpp/LICENSE ) set_target_properties( @@ -83,25 +82,16 @@ set_target_properties( INTERFACE_MAPBOX_NAME "Optional" INTERFACE_MAPBOX_URL "https://github.com/akrzemi1/Optional" INTERFACE_MAPBOX_AUTHOR "Andrzej Krzemienski" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/optional/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/optional/LICENSE ) set_target_properties( - mapbox-base-typewrapper + mapbox-base PROPERTIES - INTERFACE_MAPBOX_NAME "typewrapper" + INTERFACE_MAPBOX_NAME "mapbox-base" INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-base" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/typewrapper/LICENSE -) - -set_target_properties( - mapbox-base-value - PROPERTIES - INTERFACE_MAPBOX_NAME "value" - INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-base" - INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/value/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/LICENSE ) set_target_properties( @@ -110,14 +100,5 @@ set_target_properties( INTERFACE_MAPBOX_NAME "variant" INTERFACE_MAPBOX_URL "https://github.com/mapbox/variant" INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/variant/LICENSE -) - -set_target_properties( - mapbox-base-weak - PROPERTIES - INTERFACE_MAPBOX_NAME "weak" - INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-base" - INTERFACE_MAPBOX_AUTHOR "Mapbox" - INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/weak/LICENSE + INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/variant/LICENSE ) |