From 28be4cea97ed35d64bf3b0d62001e467de412caf Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 20 Sep 2025 11:44:31 +0200 Subject: [PATCH] build: Move X11 library linking to backend, make X11 not required --- lib/third_party/imgui/backend/CMakeLists.txt | 6 ++++++ lib/third_party/imgui/imgui/CMakeLists.txt | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/third_party/imgui/backend/CMakeLists.txt b/lib/third_party/imgui/backend/CMakeLists.txt index 506978153..c5f54167e 100644 --- a/lib/third_party/imgui/backend/CMakeLists.txt +++ b/lib/third_party/imgui/backend/CMakeLists.txt @@ -19,6 +19,12 @@ if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) find_package(OpenGL REQUIRED) find_package(Freetype REQUIRED) + if (UNIX AND NOT APPLE AND NOT EMSCRIPTEN) + find_package(X11) + target_include_directories(imgui_backend PUBLIC ${X11_INCLUDE_DIR}) + target_link_libraries(imgui_backend PUBLIC ${X11_LIBRARIES}) + endif() + find_package(GLFW QUIET) if (NOT GLFW_FOUND OR "${GLFW_LIBRARIES}" STREQUAL "") find_package(glfw3 QUIET) diff --git a/lib/third_party/imgui/imgui/CMakeLists.txt b/lib/third_party/imgui/imgui/CMakeLists.txt index 2a29e1cf3..fc83b6187 100644 --- a/lib/third_party/imgui/imgui/CMakeLists.txt +++ b/lib/third_party/imgui/imgui/CMakeLists.txt @@ -26,12 +26,6 @@ if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) find_package(Freetype REQUIRED) - if (UNIX AND NOT APPLE) - find_package(X11 REQUIRED) - target_include_directories(imgui_imgui PUBLIC ${X11_INCLUDE_DIR}) - target_link_libraries(imgui_imgui PUBLIC ${X11_LIBRARIES}) - endif() - target_include_directories(imgui_imgui PUBLIC ${FREETYPE_INCLUDE_DIRS}) target_link_directories(imgui_imgui PUBLIC ${FREETYPE_LIBRARY_DIRS}) target_link_libraries(imgui_imgui PUBLIC ${FREETYPE_LIBRARIES} ${LUNASVG_LIBRARIES})