From 7c9874716a14a50ba765ba68463d4bf01ef0abad Mon Sep 17 00:00:00 2001 From: Robert Mikhayelyan Date: Thu, 14 Jun 2018 12:37:26 -0700 Subject: Fix ANGLE_USE_X11 being dropped on Linux --- ports/angle/CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 07a538f7a..140b4b09a 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -226,6 +226,14 @@ else() set(LIBANGLE_RENDERER_PLATFORM ) endif() +if(LINUX) + set(LIBANGLE_RENDERER_COMPILEDEF + -DANGLE_USE_X11 + ) +else() + set(LIBANGLE_RENDERER_COMPILEDEF ) +endif() + add_library(libANGLE STATIC ${LIBANGLE_SOURCES}) target_link_libraries(libANGLE PRIVATE angle::common @@ -239,7 +247,7 @@ target_compile_definitions(libANGLE PRIVATE -DANGLE_ENABLE_NULL PUBLIC -DLIBANGLE_IMPLEMENTATION - $<$:ANGLE_USE_X11> + ${LIBANGLE_RENDERER_COMPILEDEF} ) add_library(angle::libANGLE ALIAS libANGLE) -- cgit v1.2.3