summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-08-16 01:28:53 +0800
committerErik Kundiman <erik@megapahit.org>2023-08-16 01:28:53 +0800
commitd883a11567252d9a0baff653bb16c38817a7c21c (patch)
tree3d6b55273bda48fe64d2f7ba038e68175546bd6b
parent6d31ea65d2c597397971fb97fc17610277104e1b (diff)
Try not to rely (explicitly) on X11
-rw-r--r--indra/cmake/LLWindow.cmake2
-rw-r--r--indra/cmake/UI.cmake3
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 09b8fdb83d..91453936f5 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} X11)
+ target_link_libraries(ll::SDL INTERFACE ${Sdl2_LIBRARIES})
return ()
endif ()
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 03bdf4e434..2e0709317b 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -5,7 +5,8 @@ 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 LL_X11=1 )
+ target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1)
if( USE_CONAN )
target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )