diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-26 16:08:23 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-27 18:19:31 +0200 |
| commit | 427d785848ba1cbf8df095ebe75c8731f30dfb5e (patch) | |
| tree | 317eb2ba3ba7078f13f00cd83a0368d76f6b949f /CMakeLists.txt | |
| parent | 242b719f0cbb24b485e439edd0da5aedee87f444 (diff) | |
| download | qtlocation-mapboxgl-427d785848ba1cbf8df095ebe75c8731f30dfb5e.tar.gz | |
[build] Make csscolorparser and parsedate vendors
They have a different license from the rest of the code
and this will make it explicit. Also the script for generating
the license will dectect them correctly.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ca0fbefa74..4b7c98eac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,8 +265,6 @@ add_library( ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_request.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task_impl.hpp - ${PROJECT_SOURCE_DIR}/src/csscolorparser/csscolorparser.cpp - ${PROJECT_SOURCE_DIR}/src/csscolorparser/csscolorparser.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/actor/mailbox.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/actor/scheduler.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/algorithm/update_renderables.hpp @@ -799,8 +797,6 @@ add_library( ${PROJECT_SOURCE_DIR}/src/mbgl/util/version.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/version.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/work_request.cpp - ${PROJECT_SOURCE_DIR}/src/parsedate/parsedate.cpp - ${PROJECT_SOURCE_DIR}/src/parsedate/parsedate.hpp ) if(MBGL_WITH_OPENGL) @@ -933,10 +929,12 @@ target_include_directories( PUBLIC ${PROJECT_SOURCE_DIR}/include ) -include(${PROJECT_SOURCE_DIR}/vendor/mapbox-base.cmake) include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake) +include(${PROJECT_SOURCE_DIR}/vendor/csscolorparser.cmake) include(${PROJECT_SOURCE_DIR}/vendor/earcut.hpp.cmake) include(${PROJECT_SOURCE_DIR}/vendor/eternal.cmake) +include(${PROJECT_SOURCE_DIR}/vendor/mapbox-base.cmake) +include(${PROJECT_SOURCE_DIR}/vendor/parsedate.cmake) include(${PROJECT_SOURCE_DIR}/vendor/polylabel.cmake) include(${PROJECT_SOURCE_DIR}/vendor/protozero.cmake) include(${PROJECT_SOURCE_DIR}/vendor/unique_resource.cmake) @@ -952,8 +950,10 @@ target_link_libraries( Mapbox::Base::geojson-vt-cpp mbgl-compiler-options mbgl-vendor-boost + mbgl-vendor-csscolorparser mbgl-vendor-earcut.hpp mbgl-vendor-eternal + mbgl-vendor-parsedate mbgl-vendor-polylabel mbgl-vendor-protozero mbgl-vendor-unique_resource |