From 12487dc5c00d68cd742f2ef4ee0a0b0713cce9f1 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 16 Aug 2023 16:13:30 +0800 Subject: Revert "Try not to rely (explicitly) on X11" This reverts commit d883a11567252d9a0baff653bb16c38817a7c21c. --- indra/cmake/LLWindow.cmake | 2 +- indra/cmake/UI.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 91453936f5..09b8fdb83d 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -13,7 +13,7 @@ if (NOT (USE_AUTOBUILD_3P OR USE_CONAN) AND NOT DARWIN) target_compile_definitions( ll::SDL INTERFACE LL_SDL=1) target_include_directories(ll::SDL SYSTEM INTERFACE ${Sdl2_INCLUDE_DIRS}) target_link_directories(ll::SDL INTERFACE ${Sdl2_LIBRARY_DIRS}) - target_link_libraries(ll::SDL INTERFACE ${Sdl2_LIBRARIES}) + target_link_libraries(ll::SDL INTERFACE ${Sdl2_LIBRARIES} X11) return () endif () diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 2e0709317b..03bdf4e434 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -5,8 +5,7 @@ include(FreeType) add_library( ll::uilibraries INTERFACE IMPORTED ) if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - #target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 ) - target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1) + target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 ) if( USE_CONAN ) target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk ) -- cgit v1.2.3