diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-07-29 11:18:57 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-07-29 18:36:08 +0300 |
| commit | 6f0cda8c8b8e7831f04ae5e00b13387107dcad9b (patch) | |
| tree | 985607080970868ae8204cb5ef6a37b0d75bdcfc /cmake | |
| parent | 41e30343f7c9772ba0a3dfa1497dd5657b18aca1 (diff) | |
| download | qtlocation-mapboxgl-6f0cda8c8b8e7831f04ae5e00b13387107dcad9b.tar.gz | |
[build] Use mapbox-base optional
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core.cmake | 1 | ||||
| -rw-r--r-- | cmake/loop-darwin.cmake | 2 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/cmake/core.cmake b/cmake/core.cmake index 7f70f65557..abb55d174a 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -31,7 +31,6 @@ target_link_libraries(mbgl-core PUBLIC mapbox-base geojson.hpp ${ICU_LIBRARY} - optional polylabel protozero rapidjson diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake index 46d8f9edc0..9e52639c52 100644 --- a/cmake/loop-darwin.cmake +++ b/cmake/loop-darwin.cmake @@ -8,7 +8,7 @@ target_include_directories(mbgl-loop-darwin ) target_link_libraries(mbgl-loop-darwin PUBLIC - optional + mapbox-base ) create_source_groups(mbgl-loop-darwin) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index a59c5921b3..aa986aaf5e 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -16,7 +16,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/optional.cmake) include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake) include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake) |