diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-11-29 15:54:40 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-11-29 17:31:33 +0100 |
commit | 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 (patch) | |
tree | 788aa097c9b079b2c0203be41ece33a49b0a753b /cmake | |
parent | 2eec5a19803a01e21d5793706ae69ac0d886cee5 (diff) | |
download | qtlocation-mapboxgl-8757164ac8f2b033b2b12d4baf075ed18cfeb2b4.tar.gz |
[build] standardize on -fvisibility=hidden for all targets
Enables -fvisibility=hidden for iOS and Linux, and adds a workaround for GCC 6.3-7.1
Adds a GCC 6 build
Enables diagnostics for C files
Fixes a shadow warning in parsedate.c
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/benchmark.cmake | 4 | ||||
-rw-r--r-- | cmake/core.cmake | 5 | ||||
-rw-r--r-- | cmake/filesource.cmake | 7 | ||||
-rw-r--r-- | cmake/glfw.cmake | 4 | ||||
-rw-r--r-- | cmake/loop-darwin.cmake | 7 | ||||
-rw-r--r-- | cmake/loop-uv.cmake | 5 | ||||
-rw-r--r-- | cmake/node.cmake | 5 | ||||
-rw-r--r-- | cmake/offline.cmake | 4 | ||||
-rw-r--r-- | cmake/render.cmake | 4 | ||||
-rw-r--r-- | cmake/test.cmake | 4 |
10 files changed, 0 insertions, 49 deletions
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 623483bedf..ea5b3dfa7a 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -2,10 +2,6 @@ add_executable(mbgl-benchmark ${MBGL_BENCHMARK_FILES} ) -target_compile_options(mbgl-benchmark - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-benchmark PRIVATE src PRIVATE benchmark/include diff --git a/cmake/core.cmake b/cmake/core.cmake index e1001787fa..43ec141b78 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -2,11 +2,6 @@ add_library(mbgl-core STATIC ${MBGL_CORE_FILES} ) -target_compile_options(mbgl-core - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-core PUBLIC include PRIVATE src diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake index 6251224d44..861a845d6e 100644 --- a/cmake/filesource.cmake +++ b/cmake/filesource.cmake @@ -30,13 +30,6 @@ target_add_mason_package(mbgl-filesource PRIVATE rapidjson) target_add_mason_package(mbgl-filesource PRIVATE boost) target_add_mason_package(mbgl-filesource PRIVATE geojson) -set_xcode_property(mbgl-filesource GCC_SYMBOLS_PRIVATE_EXTERN YES) - -target_compile_options(mbgl-filesource - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-filesource PRIVATE include PRIVATE src diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index 29d8d2ba94..f829034e6d 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -12,10 +12,6 @@ target_sources(mbgl-glfw PRIVATE platform/default/mbgl/util/default_styles.hpp ) -target_compile_options(mbgl-glfw - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-glfw PRIVATE platform/default ) diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake index 46511d2548..692aecb8a2 100644 --- a/cmake/loop-darwin.cmake +++ b/cmake/loop-darwin.cmake @@ -4,13 +4,6 @@ add_library(mbgl-loop-darwin STATIC platform/darwin/src/timer.cpp ) -set_xcode_property(mbgl-loop-darwin GCC_SYMBOLS_PRIVATE_EXTERN YES) - -target_compile_options(mbgl-loop-darwin - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-loop-darwin PRIVATE include PRIVATE src diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake index 8840040963..f4e7ced00e 100644 --- a/cmake/loop-uv.cmake +++ b/cmake/loop-uv.cmake @@ -4,11 +4,6 @@ add_library(mbgl-loop-uv STATIC platform/default/timer.cpp ) -target_compile_options(mbgl-loop-uv - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-loop-uv PRIVATE include PRIVATE src diff --git a/cmake/node.cmake b/cmake/node.cmake index 3f7bcdb784..0c2f556b7d 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -27,11 +27,6 @@ target_sources(mbgl-node PRIVATE platform/node/src/util/async_queue.hpp ) -target_compile_options(mbgl-node - PRIVATE -fPIC - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-node PRIVATE platform/default ) diff --git a/cmake/offline.cmake b/cmake/offline.cmake index c9a3349792..e2691fdfaf 100644 --- a/cmake/offline.cmake +++ b/cmake/offline.cmake @@ -6,10 +6,6 @@ target_sources(mbgl-offline PRIVATE platform/default/mbgl/util/default_styles.hpp ) -target_compile_options(mbgl-offline - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-offline PRIVATE platform/default ) diff --git a/cmake/render.cmake b/cmake/render.cmake index aff9397f42..40f624f7ca 100644 --- a/cmake/render.cmake +++ b/cmake/render.cmake @@ -2,10 +2,6 @@ add_executable(mbgl-render bin/render.cpp ) -target_compile_options(mbgl-render - PRIVATE -fvisibility-inlines-hidden -) - target_include_directories(mbgl-render PRIVATE platform/default ) diff --git a/cmake/test.cmake b/cmake/test.cmake index ab498879e5..183263c5a9 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -8,10 +8,6 @@ else() ) endif() -target_compile_options(mbgl-test - PRIVATE -fvisibility-inlines-hidden -) - set_source_files_properties(test/src/mbgl/test/util.cpp PROPERTIES COMPILE_FLAGS -DNODE_EXECUTABLE="${NodeJS_EXECUTABLE}") target_include_directories(mbgl-test |