logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

0001-CMake-Add-option-to-disable-X11-support.patch (2214B)

    

  1. From cc3bdb96d4fb991b373068114143515ead5bc7d6 Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Wed, 21 Sep 2022 08:59:16 +0200
  4. Subject: [PATCH 1/2] CMake: Add option to disable X11 support
  6. ---
  7.  CMakeLists.txt | 27 +++++++++++++++------------
  8.  1 file changed, 15 insertions(+), 12 deletions(-)
  10. diff --git a/CMakeLists.txt b/CMakeLists.txt
  11. index e526b58..144884d 100644
  12. --- a/CMakeLists.txt
  13. +++ b/CMakeLists.txt
  14. @@ -13,6 +13,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
  15.  option(ENABLE_QT4 "Enable Qt 4" On)
  16.  option(ENABLE_QT5 "Enable Qt 5" On)
  17.  option(ENABLE_QT6 "Enable Qt 6" Off)
  18. +option(ENABLE_X11 "Enable X11" On)
  19.  option(BUILD_ONLY_PLUGIN "Build only plugin" Off)
  20.  option(BUILD_STATIC_PLUGIN "Build plugin as static" Off)
  21.  option(WITH_FCITX_PLUGIN_NAME "Enable plugin name with fcitx" On)
  22. @@ -42,24 +43,26 @@ include(ECMSetupVersion)
  23.  include(ECMGenerateHeaders)
  24.  include(ECMUninstallTarget)
  25.  
  26. -find_package(XCB REQUIRED COMPONENTS XCB)
  27.  find_package(XKBCommon 0.5.0 REQUIRED COMPONENTS XKBCommon)
  28.  if (NOT BUILD_ONLY_PLUGIN)
  29. -find_package(Fcitx5Utils 5.0.16 REQUIRED)
  30. +  find_package(Fcitx5Utils 5.0.16 REQUIRED)
  31. +endif()
  32. +if (ENABLE_X11)
  33. +  find_package(XCB REQUIRED COMPONENTS XCB)
  34. +  find_package(X11 REQUIRED)
  35. +
  36. +  add_library(X11Import UNKNOWN IMPORTED)
  37. +  set_target_properties(X11Import PROPERTIES
  38. +      IMPORTED_LOCATION "${X11_X11_LIB}"
  39. +      INTERFACE_INCLUDE_DIRECTORIES "${X11_X11_INCLUDE_PATH}")
  40.  endif()
  41. -find_package(X11 REQUIRED)
  42. -
  43. -add_library(X11Import UNKNOWN IMPORTED)
  44. -set_target_properties(X11Import PROPERTIES
  45. -    IMPORTED_LOCATION "${X11_X11_LIB}"
  46. -    INTERFACE_INCLUDE_DIRECTORIES "${X11_X11_INCLUDE_PATH}")
  47.  
  48.  if (BUILD_ONLY_PLUGIN)
  49. -# Dup a little bit option here.
  50. -include(CompilerSettings)
  51. +  # Dup a little bit option here.
  52. +  include(CompilerSettings)
  53.  else()
  54. -include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
  55. -find_package(Gettext REQUIRED)
  56. +  include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
  57. +  find_package(Gettext REQUIRED)
  58.  endif()
  59.  
  60.  set(Fcitx5Qt6_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5Qt6)
  61. -- 
  62. 2.41.0