diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 12:18:27 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 20:58:51 +0100 |
| commit | 9353fcbf4cde1f8ca2e0d30cabeb64aa3528682e (patch) | |
| tree | df198d7b62588cdd66cfe55202f9a06ce29333b5 /cmake | |
| parent | a71868fc8d68fec0b34988d90ef1165c0c87d1db (diff) | |
| download | qtlocation-mapboxgl-9353fcbf4cde1f8ca2e0d30cabeb64aa3528682e.tar.gz | |
[build] move default_styles to platform/default
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 2 | ||||
| -rw-r--r-- | cmake/glfw.cmake | 3 | ||||
| -rw-r--r-- | cmake/offline.cmake | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 15dc554782..ee7f786596 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -393,7 +393,6 @@ set(MBGL_CORE_FILES include/mbgl/util/compression.hpp include/mbgl/util/constants.hpp include/mbgl/util/convert.hpp - include/mbgl/util/default_styles.hpp include/mbgl/util/enum.hpp include/mbgl/util/exception.hpp include/mbgl/util/feature.hpp @@ -426,7 +425,6 @@ set(MBGL_CORE_FILES src/mbgl/util/compression.cpp src/mbgl/util/constants.cpp src/mbgl/util/convert.cpp - src/mbgl/util/default_styles.cpp src/mbgl/util/dtoa.cpp src/mbgl/util/dtoa.hpp src/mbgl/util/exclusive.hpp diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index 56a1335e08..5d810d319e 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -7,6 +7,8 @@ target_sources(mbgl-glfw PRIVATE platform/default/glfw_view.cpp PRIVATE include/mbgl/platform/default/settings_json.hpp PRIVATE platform/default/settings_json.cpp + PRIVATE platform/default/mbgl/util/default_styles.hpp + PRIVATE platform/default/mbgl/util/default_styles.cpp ) target_compile_options(mbgl-glfw @@ -16,6 +18,7 @@ target_compile_options(mbgl-glfw target_include_directories(mbgl-glfw PRIVATE include PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-glfw diff --git a/cmake/offline.cmake b/cmake/offline.cmake index 1dc67f7887..23824e6bdf 100644 --- a/cmake/offline.cmake +++ b/cmake/offline.cmake @@ -2,6 +2,11 @@ add_executable(mbgl-offline bin/offline.cpp ) +target_sources(mbgl-offline + PRIVATE platform/default/mbgl/util/default_styles.hpp + PRIVATE platform/default/mbgl/util/default_styles.cpp +) + target_compile_options(mbgl-offline PRIVATE -fvisibility-inlines-hidden ) @@ -9,6 +14,7 @@ target_compile_options(mbgl-offline target_include_directories(mbgl-offline PRIVATE include PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-offline |