diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-13 14:24:23 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-13 14:59:06 +0300 |
| commit | d0be2ed2a6876226c99591ddf1cde0f9fc85580c (patch) | |
| tree | fe7b888fc8593af753621db2e04003c7c9997d0f /cmake | |
| parent | 73869d12dd2e651b09a158a3cbd6100801b5c397 (diff) | |
| download | qtlocation-mapboxgl-d0be2ed2a6876226c99591ddf1cde0f9fc85580c.tar.gz | |
[build] Update GLFW to 2017-07-13-67c9155
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/glfw.cmake | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index 8e001abb27..3dca089c14 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -10,17 +10,6 @@ target_sources(mbgl-glfw PRIVATE platform/default/mbgl/util/default_styles.hpp ) -# Our GL implementation is internal to mbgl-core, which causes the GL header to -# be included after GLFW's own header. They both attempt to define GLAPIENTRY, -# but unfortunately the GL header doesn't check if it was previously defined, -# causing a macro redefinition compiler error. -# There is no particular compiler warning flag to ignore this check on GCC -# neither it does accept ignoring '-Werror' via diagnostics pragmas. We can -# only suppress this by either replacing the header path inclusion from -I to -# -isystem, or completely suppressing errors. Until the former solution is not -# available, we'll suppress the errors from that definition file. -set_source_files_properties(platform/glfw/glfw_view.cpp PROPERTIES COMPILE_FLAGS -Wno-error) - target_compile_options(mbgl-glfw PRIVATE -fvisibility-inlines-hidden ) |