diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-19 13:13:06 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-23 11:13:42 -0600 |
| commit | 0ccc255f0e097b823537c37495b39de554f600fb (patch) | |
| tree | 0d68fb62f3255415af383cbf05871aae91b38069 /platform/linux | |
| parent | ea36c519689ddd327cb70311d484af593bc8883f (diff) | |
| download | qtlocation-mapboxgl-0ccc255f0e097b823537c37495b39de554f600fb.tar.gz | |
[linux] mesa 13.0.3
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/config.cmake | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index dcd4692a18..13f3edb96f 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,7 +1,5 @@ mason_use(glfw VERSION 3.2.1) -if(IS_CI_BUILD AND NOT WITH_EGL) - mason_use(mesa VERSION 13.0.0${MASON_MESA_SUFFIX}) -endif() +mason_use(mesa VERSION 13.0.3) mason_use(boost_libprogram_options VERSION 1.62.0${MASON_CXXABI_SUFFIX}) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) @@ -16,19 +14,21 @@ mason_use(icu VERSION 58.1) include(cmake/loop-uv.cmake) macro(mbgl_platform_core) + target_add_mason_package(mbgl-core PUBLIC mesa) + if(WITH_OSMESA) target_sources(mbgl-core PRIVATE platform/default/headless_backend_osmesa.cpp PRIVATE platform/default/mbgl/gl/headless_display.cpp ) - target_add_mason_package(mbgl-core PUBLIC mesa) + target_link_libraries(mbgl-core + PUBLIC -lOSMesa + ) elseif(WITH_EGL) target_sources(mbgl-core PRIVATE platform/linux/src/headless_backend_egl.cpp PRIVATE platform/linux/src/headless_display_egl.cpp ) - # TODO: Provide surface-less EGL mesa for CI builds. - # https://github.com/mapbox/mapbox-gl-native/issues/7020 target_link_libraries(mbgl-core PUBLIC -lGLESv2 PUBLIC -lEGL @@ -39,15 +39,10 @@ macro(mbgl_platform_core) PRIVATE platform/linux/src/headless_backend_glx.cpp PRIVATE platform/linux/src/headless_display_glx.cpp ) - if (IS_CI_BUILD) - target_add_mason_package(mbgl-core PUBLIC mesa) - target_link_libraries(mbgl-core PUBLIC -lX11) - else() - target_link_libraries(mbgl-core - PUBLIC -lGL - PUBLIC -lX11 - ) - endif() + target_link_libraries(mbgl-core + PUBLIC -lGL + PUBLIC -lX11 + ) endif() target_sources(mbgl-core |