diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 58ba80a..1460cf9 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -21,7 +21,7 @@ add_checked_subdirectory(expected) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) add_checked_subdirectory(fcitx_qt5) if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) - add_checked_subdirectory(fcitx5_qt5) + add_checked_subdirectory(fcitx5_qt) endif() endif() add_checked_subdirectory(ffmpeg) diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt/CMakeLists.txt similarity index 57% rename from external/fcitx5_qt5/CMakeLists.txt rename to external/fcitx5_qt/CMakeLists.txt index 2d57f29..0058582 100644 --- a/external/fcitx5_qt5/CMakeLists.txt +++ b/external/fcitx5_qt/CMakeLists.txt @@ -5,22 +5,22 @@ # https://github.com/desktop-app/legal/blob/master/LEGAL if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) - add_library(external_fcitx5_qt5 INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_fcitx5_qt5 ALIAS external_fcitx5_qt5) + add_library(external_fcitx5_qt INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt) else() - add_library(external_fcitx5_qt5 STATIC) - add_library(desktop-app::external_fcitx5_qt5 ALIAS external_fcitx5_qt5) - init_target(external_fcitx5_qt5 "(external)") + add_library(external_fcitx5_qt STATIC) + add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt) + init_target(external_fcitx5_qt "(external)") set(fcitx5_qt_loc ${third_party_loc}/fcitx5-qt) - set(fcitx5_qt5_src ${fcitx5_qt_loc}/qt5/platforminputcontext) + set(fcitx5_qt_src ${fcitx5_qt_loc}/qt5/platforminputcontext) - set_target_properties(external_fcitx5_qt5 PROPERTIES AUTOMOC ON) + set_target_properties(external_fcitx5_qt PROPERTIES AUTOMOC ON) set(FCITX5_QT_EXTRA_PLUGIN_NAME "") - configure_file("${fcitx5_qt5_src}/fcitx5.json.in" "${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json") + configure_file("${fcitx5_qt_src}/fcitx5.json.in" "${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json") - nice_target_sources(external_fcitx5_qt5 ${fcitx5_qt5_src} + nice_target_sources(external_fcitx5_qt ${fcitx5_qt_src} PRIVATE qfcitxplatforminputcontext.cpp qfcitxplatforminputcontext.h @@ -35,22 +35,22 @@ else() main.h ) - target_include_directories(external_fcitx5_qt5 + target_include_directories(external_fcitx5_qt PRIVATE - ${fcitx5_qt5_src} + ${fcitx5_qt_src} ${fcitx5_qt_loc}/common ) - target_compile_definitions(external_fcitx5_qt5 + target_compile_definitions(external_fcitx5_qt PRIVATE QT_STATICPLUGIN FCITX_PLUGIN_DATA_FILE_PATH="${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json" ) - add_subdirectory(fcitx5_qt5_dbusaddons) - target_link_libraries(external_fcitx5_qt5 + add_subdirectory(fcitx5_qt_dbusaddons) + target_link_libraries(external_fcitx5_qt PRIVATE - desktop-app::external_fcitx5_qt5_dbusaddons + desktop-app::external_fcitx5_qt_dbusaddons desktop-app::external_qt desktop-app::external_xcb ) @@ -59,7 +59,7 @@ else() find_package(PkgConfig REQUIRED) pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon) - target_link_libraries(external_fcitx5_qt5 + target_link_libraries(external_fcitx5_qt PRIVATE PkgConfig::XKBCOMMON ) @@ -67,12 +67,12 @@ else() find_package(PkgConfig REQUIRED) pkg_check_modules(XKBCOMMON REQUIRED xkbcommon) - target_include_directories(external_fcitx5_qt5 SYSTEM + target_include_directories(external_fcitx5_qt SYSTEM PUBLIC ${XKBCOMMON_INCLUDE_DIRS} ) - target_link_static_libraries(external_fcitx5_qt5 + target_link_static_libraries(external_fcitx5_qt PRIVATE xkbcommon ) diff --git a/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt b/external/fcitx5_qt/fcitx5_qt_dbusaddons/CMakeLists.txt similarity index 50% rename from external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt rename to external/fcitx5_qt/fcitx5_qt_dbusaddons/CMakeLists.txt index 9af7e3e..be7cfe1 100644 --- a/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt +++ b/external/fcitx5_qt/fcitx5_qt_dbusaddons/CMakeLists.txt @@ -5,19 +5,19 @@ # https://github.com/desktop-app/legal/blob/master/LEGAL if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) - add_library(external_fcitx5_qt5_dbusaddons INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) + add_library(external_fcitx5_qt_dbusaddons INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons) else() - add_library(external_fcitx5_qt5_dbusaddons STATIC) - add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) - init_target(external_fcitx5_qt5_dbusaddons "(external)") + add_library(external_fcitx5_qt_dbusaddons STATIC) + add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons) + init_target(external_fcitx5_qt_dbusaddons "(external)") set(fcitx5_qt_loc ${third_party_loc}/fcitx5-qt) - set(fcitx5_qt5_dbusaddons_src ${fcitx5_qt_loc}/qt5/dbusaddons) + set(fcitx5_qt_dbusaddons_src ${fcitx5_qt_loc}/qt5/dbusaddons) - set_target_properties(external_fcitx5_qt5_dbusaddons PROPERTIES AUTOMOC ON) + set_target_properties(external_fcitx5_qt_dbusaddons PROPERTIES AUTOMOC ON) - nice_target_sources(external_fcitx5_qt5_dbusaddons ${fcitx5_qt5_dbusaddons_src} + nice_target_sources(external_fcitx5_qt_dbusaddons ${fcitx5_qt_dbusaddons_src} PRIVATE fcitxqtwatcher.cpp fcitxqtwatcher.h @@ -33,20 +33,20 @@ else() ) include(GenerateExportHeader) - generate_export_header(external_fcitx5_qt5_dbusaddons BASE_NAME Fcitx5Qt5DBusAddons) + generate_export_header(external_fcitx5_qt_dbusaddons BASE_NAME Fcitx5Qt5DBusAddons) - target_include_directories(external_fcitx5_qt5_dbusaddons + target_include_directories(external_fcitx5_qt_dbusaddons PUBLIC - ${fcitx5_qt5_dbusaddons_src} + ${fcitx5_qt_dbusaddons_src} "${CMAKE_CURRENT_BINARY_DIR}" ) - target_compile_definitions(external_fcitx5_qt5_dbusaddons + target_compile_definitions(external_fcitx5_qt_dbusaddons PRIVATE FCITX5QT5DBUSADDONS_STATIC_DEFINE ) - target_link_libraries(external_fcitx5_qt5_dbusaddons + target_link_libraries(external_fcitx5_qt_dbusaddons PRIVATE desktop-app::external_qt ) diff --git a/external/qt/qt_static_plugins/CMakeLists.txt b/external/qt/qt_static_plugins/CMakeLists.txt index 4cbb27b..7a8651a 100644 --- a/external/qt/qt_static_plugins/CMakeLists.txt +++ b/external/qt/qt_static_plugins/CMakeLists.txt @@ -33,7 +33,7 @@ if (LINUX) if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) target_link_libraries(external_qt_static_plugins PUBLIC - desktop-app::external_fcitx5_qt5 + desktop-app::external_fcitx5_qt ) endif() endif()