diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 15:43:19 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 20:58:51 +0100 |
| commit | e76de0540284118845c93c4351c82c6c8d5a090a (patch) | |
| tree | dc295f87b74c5a4766444f6d1e7020e6219017a8 /cmake | |
| parent | 117863f1114551407c481abc752f5fcfd139c878 (diff) | |
| download | qtlocation-mapboxgl-e76de0540284118845c93c4351c82c6c8d5a090a.tar.gz | |
[build] move logging to util
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 12 | ||||
| -rw-r--r-- | cmake/node.cmake | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 4c50911b81..6343b5efc5 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -130,13 +130,6 @@ set(MBGL_CORE_FILES src/parsedate/parsedate.c src/parsedate/parsedate.h - # platform - include/mbgl/platform/event.hpp - include/mbgl/platform/log.hpp - include/mbgl/platform/platform.hpp - src/mbgl/platform/event.cpp - src/mbgl/platform/log.cpp - # programs src/mbgl/programs/attributes.hpp src/mbgl/programs/circle_program.cpp @@ -386,6 +379,7 @@ set(MBGL_CORE_FILES include/mbgl/util/constants.hpp include/mbgl/util/convert.hpp include/mbgl/util/enum.hpp + include/mbgl/util/event.hpp include/mbgl/util/exception.hpp include/mbgl/util/feature.hpp include/mbgl/util/font_stack.hpp @@ -393,8 +387,10 @@ set(MBGL_CORE_FILES include/mbgl/util/geojson.hpp include/mbgl/util/geometry.hpp include/mbgl/util/image.hpp + include/mbgl/util/logging.hpp include/mbgl/util/noncopyable.hpp include/mbgl/util/optional.hpp + include/mbgl/util/platform.hpp include/mbgl/util/projection.hpp include/mbgl/util/range.hpp include/mbgl/util/run_loop.hpp @@ -419,6 +415,7 @@ set(MBGL_CORE_FILES src/mbgl/util/convert.cpp src/mbgl/util/dtoa.cpp src/mbgl/util/dtoa.hpp + src/mbgl/util/event.cpp src/mbgl/util/exclusive.hpp src/mbgl/util/font_stack.cpp src/mbgl/util/geo.cpp @@ -438,6 +435,7 @@ set(MBGL_CORE_FILES src/mbgl/util/intersection_tests.hpp src/mbgl/util/io.cpp src/mbgl/util/io.hpp + src/mbgl/util/logging.cpp src/mbgl/util/mapbox.cpp src/mbgl/util/mapbox.hpp src/mbgl/util/mat2.cpp diff --git a/cmake/node.cmake b/cmake/node.cmake index bb3112cc09..ea28e86106 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -3,8 +3,8 @@ add_nodejs_module(mbgl-node ) target_sources(mbgl-node - PRIVATE platform/node/src/node_log.hpp - PRIVATE platform/node/src/node_log.cpp + PRIVATE platform/node/src/node_logging.hpp + PRIVATE platform/node/src/node_logging.cpp PRIVATE platform/node/src/node_map.hpp PRIVATE platform/node/src/node_map.cpp PRIVATE platform/node/src/node_request.hpp |