summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-09 16:54:31 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-17 01:01:15 +0100
commit0ef52d7f7ceee670e8961e811364d215fde7e980 (patch)
tree8da11b6a56a1b21dc4c0a5a7119ad4c052648488 /platform
parent32b6f2fa0383f04855a181f6db61df84968ec97c (diff)
downloadqtlocation-mapboxgl-0ef52d7f7ceee670e8961e811364d215fde7e980.tar.gz
[build] Added EGL & GLX CI builds
Diffstat (limited to 'platform')
-rw-r--r--platform/linux/config.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index d2f3d3aa94..94830e6d26 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -1,5 +1,5 @@
mason_use(glfw VERSION 3.2.1)
-if(IS_CI_BUILD)
+if(IS_CI_BUILD AND NOT WITH_EGL)
mason_use(mesa VERSION 13.0.0${MASON_MESA_SUFFIX}${MASON_CXXABI_SUFFIX})
endif()
mason_use(boost_libprogram_options VERSION 1.60.0)
@@ -40,6 +40,7 @@ macro(mbgl_platform_core)
)
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