From c86b492bf7df62f8c09ec565b7ccfb4cd2bfcc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 28 Mar 2017 20:48:48 +0200 Subject: [PATCH] [build] don't advertise headers that aren't used in public headers --- cmake/core.cmake | 2 +- cmake/loop-darwin.cmake | 2 +- cmake/loop-uv.cmake | 2 +- platform/android/config.cmake | 2 +- platform/ios/config.cmake | 2 +- platform/linux/config.cmake | 2 +- platform/macos/config.cmake | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/core.cmake b/cmake/core.cmake index a687b020d..78800a483 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -14,7 +14,7 @@ target_include_directories(mbgl-core target_add_mason_package(mbgl-core PUBLIC geometry) target_add_mason_package(mbgl-core PUBLIC variant) -target_add_mason_package(mbgl-core PUBLIC unique_resource) +target_add_mason_package(mbgl-core PRIVATE unique_resource) target_add_mason_package(mbgl-core PRIVATE rapidjson) target_add_mason_package(mbgl-core PRIVATE boost) target_add_mason_package(mbgl-core PRIVATE geojson) diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake index 91fb74e00..c16d0de3a 100644 --- a/cmake/loop-darwin.cmake +++ b/cmake/loop-darwin.cmake @@ -12,7 +12,7 @@ target_compile_options(mbgl-loop-darwin ) target_include_directories(mbgl-loop-darwin - PUBLIC include + PRIVATE include PRIVATE src ) diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake index 9844daf20..b7757c719 100644 --- a/cmake/loop-uv.cmake +++ b/cmake/loop-uv.cmake @@ -10,7 +10,7 @@ target_compile_options(mbgl-loop-uv ) target_include_directories(mbgl-loop-uv - PUBLIC include + PRIVATE include PRIVATE src ) diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 8a590b1f2..1a878c984 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -80,7 +80,7 @@ macro(mbgl_platform_core) target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC jni.hpp) target_add_mason_package(mbgl-core PUBLIC rapidjson) - target_add_mason_package(mbgl-core PUBLIC icu) + target_add_mason_package(mbgl-core PRIVATE icu) target_compile_options(mbgl-core PRIVATE -fvisibility=hidden diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index cab8fd135..92b673634 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -65,7 +65,7 @@ macro(mbgl_platform_core) ) target_add_mason_package(mbgl-core PUBLIC geojson) - target_add_mason_package(mbgl-core PUBLIC icu) + target_add_mason_package(mbgl-core PRIVATE icu) target_compile_options(mbgl-core PRIVATE -fobjc-arc diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 97928a0e9..90b14a862 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -99,7 +99,7 @@ macro(mbgl_platform_core) target_add_mason_package(mbgl-core PUBLIC libpng) target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo) target_add_mason_package(mbgl-core PUBLIC webp) - target_add_mason_package(mbgl-core PUBLIC icu) + target_add_mason_package(mbgl-core PRIVATE icu) target_link_libraries(mbgl-core PUBLIC -lz diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 0dc914111..7a179b821 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -61,7 +61,7 @@ macro(mbgl_platform_core) ) target_add_mason_package(mbgl-core PUBLIC geojson) - target_add_mason_package(mbgl-core PUBLIC icu) + target_add_mason_package(mbgl-core PRIVATE icu) target_compile_options(mbgl-core PRIVATE -fobjc-arc