From aeaadc06b4e0614f4f243db4dce210c22dde9f9c Mon Sep 17 00:00:00 2001 From: Adrian Cojocaru Date: Fri, 25 Jul 2025 21:06:32 +0300 Subject: [PATCH] Fix OpenGL symbols leaking to other backend builds (#3660) --- platform/linux/linux.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake index 49eaae01b..cdeccac81 100644 --- a/platform/linux/linux.cmake +++ b/platform/linux/linux.cmake @@ -33,7 +33,6 @@ target_sources( PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/gfx/headless_backend.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/gfx/headless_frontend.cpp - ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/gl/headless_backend.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/i18n/collator.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/i18n/number_format.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/layermanager/layer_manager.cpp @@ -71,9 +70,17 @@ target_sources( ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/thread_local.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/utf.cpp - ${PROJECT_SOURCE_DIR}/platform/linux/src/gl_functions.cpp ) +if(MLN_WITH_OPENGL) + target_sources( + mbgl-core + PRIVATE + ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/gl/headless_backend.cpp + ${PROJECT_SOURCE_DIR}/platform/linux/src/gl_functions.cpp + ) +endif() + if(MLN_WITH_EGL) find_package(OpenGL REQUIRED EGL) target_sources(