kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

fcitx5_qt5 -> fcitx5_qt

Browse source
This commit is contained in:
Ilya Fedin 2021-10-19 17:08:14 +04:00 • committed by John Preston
parent 13575af1f3
commit 9adb6a5efc
4 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/CMakeLists.txt vendored
View file

@ -21,7 +21,7 @@ add_checked_subdirectory(expected)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(fcitx_qt5) add_checked_subdirectory(fcitx_qt5)
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
add_checked_subdirectory(fcitx5_qt5) add_checked_subdirectory(fcitx5_qt)
endif() endif()
endif() endif()
add_checked_subdirectory(ffmpeg) add_checked_subdirectory(ffmpeg)

36
external/fcitx5_qt5/CMakeLists.txt → external/fcitx5_qt/CMakeLists.txt vendored
View file

@ -5,22 +5,22 @@
# https://github.com/desktop-app/legal/blob/master/LEGAL # https://github.com/desktop-app/legal/blob/master/LEGAL
if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
add_library(external_fcitx5_qt5 INTERFACE IMPORTED GLOBAL) add_library(external_fcitx5_qt INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_fcitx5_qt5 ALIAS external_fcitx5_qt5) add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt)
else() else()
add_library(external_fcitx5_qt5 STATIC) add_library(external_fcitx5_qt STATIC)
add_library(desktop-app::external_fcitx5_qt5 ALIAS external_fcitx5_qt5) add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt)
init_target(external_fcitx5_qt5 "(external)") init_target(external_fcitx5_qt "(external)")
set(fcitx5_qt_loc ${third_party_loc}/fcitx5-qt) 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 "") 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 PRIVATE
qfcitxplatforminputcontext.cpp qfcitxplatforminputcontext.cpp
qfcitxplatforminputcontext.h qfcitxplatforminputcontext.h
@ -35,22 +35,22 @@ else()
main.h main.h
) )
target_include_directories(external_fcitx5_qt5 target_include_directories(external_fcitx5_qt
PRIVATE PRIVATE
${fcitx5_qt5_src} ${fcitx5_qt_src}
${fcitx5_qt_loc}/common ${fcitx5_qt_loc}/common
) )
target_compile_definitions(external_fcitx5_qt5 target_compile_definitions(external_fcitx5_qt
PRIVATE PRIVATE
QT_STATICPLUGIN QT_STATICPLUGIN
FCITX_PLUGIN_DATA_FILE_PATH="${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json" FCITX_PLUGIN_DATA_FILE_PATH="${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json"
) )
add_subdirectory(fcitx5_qt5_dbusaddons) add_subdirectory(fcitx5_qt_dbusaddons)
target_link_libraries(external_fcitx5_qt5 target_link_libraries(external_fcitx5_qt
PRIVATE PRIVATE
desktop-app::external_fcitx5_qt5_dbusaddons desktop-app::external_fcitx5_qt_dbusaddons
desktop-app::external_qt desktop-app::external_qt
desktop-app::external_xcb desktop-app::external_xcb
) )
@ -59,7 +59,7 @@ else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon) pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon)
target_link_libraries(external_fcitx5_qt5 target_link_libraries(external_fcitx5_qt
PRIVATE PRIVATE
PkgConfig::XKBCOMMON PkgConfig::XKBCOMMON
) )
@ -67,12 +67,12 @@ else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(XKBCOMMON REQUIRED xkbcommon) pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
target_include_directories(external_fcitx5_qt5 SYSTEM target_include_directories(external_fcitx5_qt SYSTEM
PUBLIC PUBLIC
${XKBCOMMON_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS}
) )
target_link_static_libraries(external_fcitx5_qt5 target_link_static_libraries(external_fcitx5_qt
PRIVATE PRIVATE
xkbcommon xkbcommon
) )

26
external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt → external/fcitx5_qt/fcitx5_qt_dbusaddons/CMakeLists.txt vendored
View file

@ -5,19 +5,19 @@
# https://github.com/desktop-app/legal/blob/master/LEGAL # https://github.com/desktop-app/legal/blob/master/LEGAL
if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
add_library(external_fcitx5_qt5_dbusaddons INTERFACE IMPORTED GLOBAL) add_library(external_fcitx5_qt_dbusaddons INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons)
else() else()
add_library(external_fcitx5_qt5_dbusaddons STATIC) add_library(external_fcitx5_qt_dbusaddons STATIC)
add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons)
init_target(external_fcitx5_qt5_dbusaddons "(external)") init_target(external_fcitx5_qt_dbusaddons "(external)")
set(fcitx5_qt_loc ${third_party_loc}/fcitx5-qt) 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 PRIVATE
fcitxqtwatcher.cpp fcitxqtwatcher.cpp
fcitxqtwatcher.h fcitxqtwatcher.h
@ -33,20 +33,20 @@ else()
) )
include(GenerateExportHeader) 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 PUBLIC
${fcitx5_qt5_dbusaddons_src} ${fcitx5_qt_dbusaddons_src}
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
) )
target_compile_definitions(external_fcitx5_qt5_dbusaddons target_compile_definitions(external_fcitx5_qt_dbusaddons
PRIVATE PRIVATE
FCITX5QT5DBUSADDONS_STATIC_DEFINE FCITX5QT5DBUSADDONS_STATIC_DEFINE
) )
target_link_libraries(external_fcitx5_qt5_dbusaddons target_link_libraries(external_fcitx5_qt_dbusaddons
PRIVATE PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )

2
external/qt/qt_static_plugins/CMakeLists.txt vendored
View file

@ -33,7 +33,7 @@ if (LINUX)
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
target_link_libraries(external_qt_static_plugins target_link_libraries(external_qt_static_plugins
PUBLIC PUBLIC
desktop-app::external_fcitx5_qt5 desktop-app::external_fcitx5_qt
) )
endif() endif()
endif() endif()