1
0
Fork 0

Use return to decrease indentation in cmake files

This commit is contained in:
Ilya Fedin 2022-01-11 23:04:27 +04:00 committed by John Preston
parent e5e31c6101
commit b6515c543a
20 changed files with 1226 additions and 1215 deletions

View file

@ -16,29 +16,29 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_QT6)
if (dbusmenu-qt5_FOUND) if (dbusmenu-qt5_FOUND)
target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5) target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5)
return()
endif() endif()
endif() endif()
if (NOT dbusmenu-qt5_FOUND) add_library(external_dbusmenu_qt_bundled STATIC)
add_library(external_dbusmenu_qt_bundled STATIC) init_target(external_dbusmenu_qt_bundled "(external)")
init_target(external_dbusmenu_qt_bundled "(external)")
set(dbusmenu_qt_VERSION_MAJOR 0) set(dbusmenu_qt_VERSION_MAJOR 0)
set(dbusmenu_qt_VERSION_MINOR 9) set(dbusmenu_qt_VERSION_MINOR 9)
set(dbusmenu_qt_VERSION_PATCH 2) set(dbusmenu_qt_VERSION_PATCH 2)
set(dbusmenu_qt_loc ${third_party_loc}/libdbusmenu-qt/src) set(dbusmenu_qt_loc ${third_party_loc}/libdbusmenu-qt/src)
set_target_properties(external_dbusmenu_qt_bundled PROPERTIES AUTOMOC ON) set_target_properties(external_dbusmenu_qt_bundled PROPERTIES AUTOMOC ON)
# QIcon::name was introduced in Qt 4.7. # QIcon::name was introduced in Qt 4.7.
set(HAVE_QICON_NAME ON) set(HAVE_QICON_NAME ON)
configure_file(${dbusmenu_qt_loc}/dbusmenu_config.h.in "${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_config.h" @ONLY) configure_file(${dbusmenu_qt_loc}/dbusmenu_config.h.in "${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_config.h" @ONLY)
configure_file(${dbusmenu_qt_loc}/dbusmenu_version.h.in "${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h") configure_file(${dbusmenu_qt_loc}/dbusmenu_version.h.in "${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h")
nice_target_sources(external_dbusmenu_qt_bundled ${dbusmenu_qt_loc} nice_target_sources(external_dbusmenu_qt_bundled ${dbusmenu_qt_loc}
PRIVATE PRIVATE
dbusmenu_p.cpp dbusmenu_p.cpp
dbusmenuexporter.cpp dbusmenuexporter.cpp
dbusmenuexporterdbus_p.cpp dbusmenuexporterdbus_p.cpp
@ -46,37 +46,36 @@ if (NOT dbusmenu-qt5_FOUND)
dbusmenutypes_p.cpp dbusmenutypes_p.cpp
dbusmenushortcut_p.cpp dbusmenushortcut_p.cpp
utils.cpp utils.cpp
) )
if (DESKTOP_APP_QT6) if (DESKTOP_APP_QT6)
qt6_add_dbus_adaptor(dbusmenu_adaptor qt6_add_dbus_adaptor(dbusmenu_adaptor
${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml
${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h
DBusMenuExporterDBus DBusMenuExporterDBus
) )
else() else()
qt5_add_dbus_adaptor(dbusmenu_adaptor qt5_add_dbus_adaptor(dbusmenu_adaptor
${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml
${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h
DBusMenuExporterDBus DBusMenuExporterDBus
) )
endif() endif()
target_sources(external_dbusmenu_qt_bundled PRIVATE ${dbusmenu_adaptor}) target_sources(external_dbusmenu_qt_bundled PRIVATE ${dbusmenu_adaptor})
target_include_directories(external_dbusmenu_qt_bundled target_include_directories(external_dbusmenu_qt_bundled
PUBLIC PUBLIC
${dbusmenu_qt_loc} ${dbusmenu_qt_loc}
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
) )
target_link_libraries(external_dbusmenu_qt_bundled target_link_libraries(external_dbusmenu_qt_bundled
PRIVATE PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
target_link_libraries(external_dbusmenu_qt target_link_libraries(external_dbusmenu_qt
INTERFACE INTERFACE
external_dbusmenu_qt_bundled external_dbusmenu_qt_bundled
) )
endif()

View file

@ -16,12 +16,11 @@ if (DESKTOP_APP_USE_PACKAGED)
if (tl-expected_FOUND) if (tl-expected_FOUND)
target_link_libraries(external_expected INTERFACE tl::expected) target_link_libraries(external_expected INTERFACE tl::expected)
return()
endif() endif()
endif() endif()
if (NOT tl-expected_FOUND) target_include_directories(external_expected SYSTEM
target_include_directories(external_expected SYSTEM INTERFACE
INTERFACE
${third_party_loc}/expected/include ${third_party_loc}/expected/include
) )
endif()

View file

@ -7,26 +7,28 @@
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_qt INTERFACE IMPORTED GLOBAL) add_library(external_fcitx5_qt INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt) add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt)
else() return()
add_library(external_fcitx5_qt STATIC) endif()
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) add_library(external_fcitx5_qt STATIC)
add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt)
init_target(external_fcitx5_qt "(external)")
if (DESKTOP_APP_QT6) set(fcitx5_qt_loc ${third_party_loc}/fcitx5-qt)
if (DESKTOP_APP_QT6)
set(fcitx5_qt_src ${fcitx5_qt_loc}/qt6/platforminputcontext) set(fcitx5_qt_src ${fcitx5_qt_loc}/qt6/platforminputcontext)
else() else()
set(fcitx5_qt_src ${fcitx5_qt_loc}/qt5/platforminputcontext) set(fcitx5_qt_src ${fcitx5_qt_loc}/qt5/platforminputcontext)
endif() endif()
set_target_properties(external_fcitx5_qt 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_qt_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_qt ${fcitx5_qt_src} nice_target_sources(external_fcitx5_qt ${fcitx5_qt_src}
PRIVATE PRIVATE
qfcitxplatforminputcontext.cpp qfcitxplatforminputcontext.cpp
qfcitxplatforminputcontext.h qfcitxplatforminputcontext.h
fcitxcandidatewindow.cpp fcitxcandidatewindow.cpp
@ -38,29 +40,29 @@ else()
qtkey.cpp qtkey.cpp
main.cpp main.cpp
main.h main.h
) )
target_include_directories(external_fcitx5_qt target_include_directories(external_fcitx5_qt
PRIVATE PRIVATE
${fcitx5_qt_src} ${fcitx5_qt_src}
${fcitx5_qt_loc}/common ${fcitx5_qt_loc}/common
) )
target_compile_definitions(external_fcitx5_qt 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_qt_dbusaddons) add_subdirectory(fcitx5_qt_dbusaddons)
target_link_libraries(external_fcitx5_qt target_link_libraries(external_fcitx5_qt
PRIVATE PRIVATE
desktop-app::external_fcitx5_qt_dbusaddons desktop-app::external_fcitx5_qt_dbusaddons
desktop-app::external_qt desktop-app::external_qt
desktop-app::external_xcb desktop-app::external_xcb
) )
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon) pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon)
@ -68,7 +70,7 @@ else()
PRIVATE PRIVATE
PkgConfig::XKBCOMMON PkgConfig::XKBCOMMON
) )
else() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(XKBCOMMON REQUIRED xkbcommon) pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
@ -81,5 +83,4 @@ else()
PRIVATE PRIVATE
xkbcommon xkbcommon
) )
endif()
endif() endif()

View file

@ -7,23 +7,25 @@
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_qt_dbusaddons INTERFACE IMPORTED GLOBAL) add_library(external_fcitx5_qt_dbusaddons INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons) add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons)
else() return()
add_library(external_fcitx5_qt_dbusaddons STATIC) endif()
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) 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)")
if (DESKTOP_APP_QT6) set(fcitx5_qt_loc ${third_party_loc}/fcitx5-qt)
if (DESKTOP_APP_QT6)
set(fcitx5_qt_dbusaddons_src ${fcitx5_qt_loc}/qt6/dbusaddons) set(fcitx5_qt_dbusaddons_src ${fcitx5_qt_loc}/qt6/dbusaddons)
else() else()
set(fcitx5_qt_dbusaddons_src ${fcitx5_qt_loc}/qt5/dbusaddons) set(fcitx5_qt_dbusaddons_src ${fcitx5_qt_loc}/qt5/dbusaddons)
endif() endif()
set_target_properties(external_fcitx5_qt_dbusaddons PROPERTIES AUTOMOC ON) set_target_properties(external_fcitx5_qt_dbusaddons PROPERTIES AUTOMOC ON)
nice_target_sources(external_fcitx5_qt_dbusaddons ${fcitx5_qt_dbusaddons_src} nice_target_sources(external_fcitx5_qt_dbusaddons ${fcitx5_qt_dbusaddons_src}
PRIVATE PRIVATE
fcitxqtwatcher.cpp fcitxqtwatcher.cpp
fcitxqtwatcher.h fcitxqtwatcher.h
fcitxqtdbustypes.cpp fcitxqtdbustypes.cpp
@ -35,31 +37,30 @@ else()
fcitxqtinputmethodproxy.h fcitxqtinputmethodproxy.h
fcitxqtcontrollerproxy.cpp fcitxqtcontrollerproxy.cpp
fcitxqtcontrollerproxy.h fcitxqtcontrollerproxy.h
) )
include(GenerateExportHeader) include(GenerateExportHeader)
if (DESKTOP_APP_QT6) if (DESKTOP_APP_QT6)
generate_export_header(external_fcitx5_qt_dbusaddons BASE_NAME Fcitx5Qt6DBusAddons) generate_export_header(external_fcitx5_qt_dbusaddons BASE_NAME Fcitx5Qt6DBusAddons)
else() else()
generate_export_header(external_fcitx5_qt_dbusaddons BASE_NAME Fcitx5Qt5DBusAddons) generate_export_header(external_fcitx5_qt_dbusaddons BASE_NAME Fcitx5Qt5DBusAddons)
endif() endif()
target_include_directories(external_fcitx5_qt_dbusaddons target_include_directories(external_fcitx5_qt_dbusaddons
PUBLIC PUBLIC
${fcitx5_qt_dbusaddons_src} ${fcitx5_qt_dbusaddons_src}
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
) )
if (NOT DESKTOP_APP_QT6) if (NOT DESKTOP_APP_QT6)
target_compile_definitions(external_fcitx5_qt_dbusaddons target_compile_definitions(external_fcitx5_qt_dbusaddons
PRIVATE PRIVATE
FCITX5QT5DBUSADDONS_STATIC_DEFINE FCITX5QT5DBUSADDONS_STATIC_DEFINE
) )
endif()
target_link_libraries(external_fcitx5_qt_dbusaddons
PRIVATE
desktop-app::external_qt
)
endif() endif()
target_link_libraries(external_fcitx5_qt_dbusaddons
PRIVATE
desktop-app::external_qt
)

View file

@ -7,71 +7,73 @@
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_fcitx_qt5 INTERFACE IMPORTED GLOBAL) add_library(external_fcitx_qt5 INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_fcitx_qt5 ALIAS external_fcitx_qt5) add_library(desktop-app::external_fcitx_qt5 ALIAS external_fcitx_qt5)
else() return()
add_library(external_fcitx_qt5 STATIC) endif()
add_library(desktop-app::external_fcitx_qt5 ALIAS external_fcitx_qt5)
init_target(external_fcitx_qt5 "(external)")
set(fcitx_qt5_loc ${third_party_loc}/fcitx-qt5) add_library(external_fcitx_qt5 STATIC)
add_library(desktop-app::external_fcitx_qt5 ALIAS external_fcitx_qt5)
init_target(external_fcitx_qt5 "(external)")
if (DESKTOP_APP_QT6) set(fcitx_qt5_loc ${third_party_loc}/fcitx-qt5)
if (DESKTOP_APP_QT6)
set(fcitx_qt5_src ${fcitx_qt5_loc}/qt6/platforminputcontext) set(fcitx_qt5_src ${fcitx_qt5_loc}/qt6/platforminputcontext)
else() else()
set(fcitx_qt5_src ${fcitx_qt5_loc}/qt5/platforminputcontext) set(fcitx_qt5_src ${fcitx_qt5_loc}/qt5/platforminputcontext)
endif() endif()
set_target_properties(external_fcitx_qt5 PROPERTIES AUTOMOC ON) set_target_properties(external_fcitx_qt5 PROPERTIES AUTOMOC ON)
nice_target_sources(external_fcitx_qt5 ${fcitx_qt5_src} nice_target_sources(external_fcitx_qt5 ${fcitx_qt5_src}
PRIVATE PRIVATE
fcitxinputcontextproxy.cpp fcitxinputcontextproxy.cpp
fcitxqtdbustypes.cpp fcitxqtdbustypes.cpp
fcitxwatcher.cpp fcitxwatcher.cpp
qfcitxplatforminputcontext.cpp qfcitxplatforminputcontext.cpp
main.cpp main.cpp
qtkey.cpp qtkey.cpp
) )
set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml PROPERTIES set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml PROPERTIES
INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h) INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h)
set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml PROPERTIES set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml PROPERTIES
INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h) INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h)
set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml PROPERTIES set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml PROPERTIES
INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h) INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h)
set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml PROPERTIES set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml PROPERTIES
INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h) INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h)
if (DESKTOP_APP_QT6) if (DESKTOP_APP_QT6)
qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy)
qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy)
qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy)
qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy)
else() else()
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy) qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy) qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy) qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy) qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy)
endif() endif()
target_sources(external_fcitx_qt5 PRIVATE ${fcitx_qt5_adaptors}) target_sources(external_fcitx_qt5 PRIVATE ${fcitx_qt5_adaptors})
target_include_directories(external_fcitx_qt5 target_include_directories(external_fcitx_qt5
PRIVATE PRIVATE
${fcitx_qt5_src} ${fcitx_qt5_src}
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
) )
target_compile_definitions(external_fcitx_qt5 target_compile_definitions(external_fcitx_qt5
PRIVATE PRIVATE
QT_STATICPLUGIN QT_STATICPLUGIN
) )
target_link_libraries(external_fcitx_qt5 target_link_libraries(external_fcitx_qt5
PRIVATE PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon) pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon)
@ -79,10 +81,9 @@ else()
PRIVATE PRIVATE
PkgConfig::XKBCOMMON PkgConfig::XKBCOMMON
) )
else() else()
target_link_static_libraries(external_fcitx_qt5 target_link_static_libraries(external_fcitx_qt5
PRIVATE PRIVATE
xkbcommon xkbcommon
) )
endif()
endif() endif()

View file

@ -7,38 +7,39 @@
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_hime_qt INTERFACE IMPORTED GLOBAL) add_library(external_hime_qt INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_hime_qt ALIAS external_hime_qt) add_library(desktop-app::external_hime_qt ALIAS external_hime_qt)
else() return()
add_library(external_hime_qt STATIC) endif()
add_library(desktop-app::external_hime_qt ALIAS external_hime_qt)
init_target(external_hime_qt "(external)")
set(hime_loc ${third_party_loc}/hime) add_library(external_hime_qt STATIC)
set(hime_qt_src ${hime_loc}/src/qt5-im) add_library(desktop-app::external_hime_qt ALIAS external_hime_qt)
init_target(external_hime_qt "(external)")
set_target_properties(external_hime_qt PROPERTIES AUTOMOC ON) set(hime_loc ${third_party_loc}/hime)
set(hime_qt_src ${hime_loc}/src/qt5-im)
nice_target_sources(external_hime_qt ${hime_qt_src} set_target_properties(external_hime_qt PROPERTIES AUTOMOC ON)
PRIVATE
nice_target_sources(external_hime_qt ${hime_qt_src}
PRIVATE
hime-imcontext-qt.cpp hime-imcontext-qt.cpp
hime-imcontext-qt.h hime-imcontext-qt.h
hime-qt.cpp hime-qt.cpp
hime-qt.h hime-qt.h
) )
target_include_directories(external_hime_qt target_include_directories(external_hime_qt
PRIVATE PRIVATE
${hime_qt_src} ${hime_qt_src}
) )
target_compile_definitions(external_hime_qt target_compile_definitions(external_hime_qt
PRIVATE PRIVATE
QT_STATICPLUGIN QT_STATICPLUGIN
) )
add_subdirectory(hime_im_client) add_subdirectory(hime_im_client)
target_link_libraries(external_hime_qt target_link_libraries(external_hime_qt
PRIVATE PRIVATE
desktop-app::external_hime_im_client desktop-app::external_hime_im_client
desktop-app::external_qt desktop-app::external_qt
) )
endif()

View file

@ -7,29 +7,30 @@
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_hime_im_client INTERFACE IMPORTED GLOBAL) add_library(external_hime_im_client INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client) add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
else() return()
add_library(external_hime_im_client STATIC)
add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
init_target(external_hime_im_client "(external)")
set(hime_loc ${third_party_loc}/hime)
set(hime_im_client_src ${hime_loc}/src/im-client)
nice_target_sources(external_hime_im_client ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE
hime_im_client_helper.cpp
)
target_include_directories(external_hime_im_client
PUBLIC
${hime_im_client_src}
)
find_package(PkgConfig REQUIRED)
pkg_check_modules(X11 REQUIRED x11)
target_include_directories(external_hime_im_client SYSTEM
PRIVATE
${X11_INCLUDE_DIRS}
)
endif() endif()
add_library(external_hime_im_client STATIC)
add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
init_target(external_hime_im_client "(external)")
set(hime_loc ${third_party_loc}/hime)
set(hime_im_client_src ${hime_loc}/src/im-client)
nice_target_sources(external_hime_im_client ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE
hime_im_client_helper.cpp
)
target_include_directories(external_hime_im_client
PUBLIC
${hime_im_client_src}
)
find_package(PkgConfig REQUIRED)
pkg_check_modules(X11 REQUIRED x11)
target_include_directories(external_hime_im_client SYSTEM
PRIVATE
${X11_INCLUDE_DIRS}
)

View file

@ -13,18 +13,18 @@ if (DESKTOP_APP_USE_PACKAGED)
if (HUNSPELL_FOUND) if (HUNSPELL_FOUND)
target_link_libraries(external_hunspell INTERFACE PkgConfig::HUNSPELL) target_link_libraries(external_hunspell INTERFACE PkgConfig::HUNSPELL)
return()
endif() endif()
endif() endif()
if (NOT HUNSPELL_FOUND) add_library(external_hunspell_bundled STATIC)
add_library(external_hunspell_bundled STATIC) init_target(external_hunspell_bundled "(external)")
init_target(external_hunspell_bundled "(external)")
set(hunspell_loc ${third_party_loc}/hunspell) set(hunspell_loc ${third_party_loc}/hunspell)
set(hunspell_src ${hunspell_loc}/src) set(hunspell_src ${hunspell_loc}/src)
nice_target_sources(external_hunspell_bundled ${hunspell_src} nice_target_sources(external_hunspell_bundled ${hunspell_src}
PRIVATE PRIVATE
hunspell/affentry.cxx hunspell/affentry.cxx
hunspell/affentry.hxx hunspell/affentry.hxx
hunspell/affixmgr.cxx hunspell/affixmgr.cxx
@ -51,21 +51,20 @@ if (NOT HUNSPELL_FOUND)
hunspell/suggestmgr.cxx hunspell/suggestmgr.cxx
hunspell/suggestmgr.hxx hunspell/suggestmgr.hxx
hunspell/utf_info.hxx hunspell/utf_info.hxx
) )
target_include_directories(external_hunspell_bundled target_include_directories(external_hunspell_bundled
PUBLIC PUBLIC
${hunspell_src} ${hunspell_src}
) )
target_compile_definitions(external_hunspell_bundled target_compile_definitions(external_hunspell_bundled
PUBLIC PUBLIC
HUNSPELL_STATIC HUNSPELL_STATIC
MAXSUGGESTION=5 MAXSUGGESTION=5
) )
target_link_libraries(external_hunspell target_link_libraries(external_hunspell
INTERFACE INTERFACE
external_hunspell_bundled external_hunspell_bundled
) )
endif()

View file

@ -13,17 +13,17 @@ if (DESKTOP_APP_USE_PACKAGED)
if (LZ4_FOUND) if (LZ4_FOUND)
target_link_libraries(external_lz4 INTERFACE PkgConfig::LZ4) target_link_libraries(external_lz4 INTERFACE PkgConfig::LZ4)
return()
endif() endif()
endif() endif()
if (NOT LZ4_FOUND) add_library(external_lz4_bundled STATIC)
add_library(external_lz4_bundled STATIC) init_target(external_lz4_bundled "(external)")
init_target(external_lz4_bundled "(external)")
set(lz4_loc ${third_party_loc}/lz4/lib) set(lz4_loc ${third_party_loc}/lz4/lib)
target_sources(external_lz4_bundled target_sources(external_lz4_bundled
PRIVATE PRIVATE
${lz4_loc}/lz4.c ${lz4_loc}/lz4.c
${lz4_loc}/lz4.h ${lz4_loc}/lz4.h
${lz4_loc}/lz4frame.c ${lz4_loc}/lz4frame.c
@ -33,15 +33,14 @@ if (NOT LZ4_FOUND)
${lz4_loc}/lz4hc.h ${lz4_loc}/lz4hc.h
${lz4_loc}/xxhash.c ${lz4_loc}/xxhash.c
${lz4_loc}/xxhash.h ${lz4_loc}/xxhash.h
) )
target_include_directories(external_lz4_bundled target_include_directories(external_lz4_bundled
PUBLIC PUBLIC
${lz4_loc} ${lz4_loc}
) )
target_link_libraries(external_lz4 target_link_libraries(external_lz4
INTERFACE INTERFACE
external_lz4_bundled external_lz4_bundled
) )
endif()

View file

@ -13,18 +13,25 @@ if (DESKTOP_APP_USE_PACKAGED)
if (MINIZIP_FOUND) if (MINIZIP_FOUND)
target_link_libraries(external_minizip INTERFACE PkgConfig::MINIZIP) target_link_libraries(external_minizip INTERFACE PkgConfig::MINIZIP)
return()
endif() endif()
endif() endif()
if (NOT MINIZIP_FOUND) if (WIN32)
if (NOT WIN32) target_include_directories(external_minizip SYSTEM
add_library(external_minizip_bundled STATIC) INTERFACE
init_target(external_minizip_bundled "(external)") ${libs_loc}/zlib/contrib/minizip
)
return()
endif()
set(minizip_loc ${third_party_loc}/minizip) add_library(external_minizip_bundled STATIC)
init_target(external_minizip_bundled "(external)")
target_sources(external_minizip_bundled set(minizip_loc ${third_party_loc}/minizip)
PRIVATE
target_sources(external_minizip_bundled
PRIVATE
${minizip_loc}/crypt.h ${minizip_loc}/crypt.h
${minizip_loc}/ioapi.c ${minizip_loc}/ioapi.c
${minizip_loc}/ioapi.h ${minizip_loc}/ioapi.h
@ -32,21 +39,14 @@ if (NOT MINIZIP_FOUND)
${minizip_loc}/zip.h ${minizip_loc}/zip.h
${minizip_loc}/unzip.c ${minizip_loc}/unzip.c
${minizip_loc}/unzip.h ${minizip_loc}/unzip.h
) )
target_include_directories(external_minizip_bundled SYSTEM target_include_directories(external_minizip_bundled SYSTEM
PUBLIC PUBLIC
${minizip_loc} ${minizip_loc}
) )
target_link_libraries(external_minizip target_link_libraries(external_minizip
INTERFACE INTERFACE
external_minizip_bundled external_minizip_bundled
) )
else()
target_include_directories(external_minizip SYSTEM
INTERFACE
${libs_loc}/zlib/contrib/minizip
)
endif()
endif()

View file

@ -7,43 +7,44 @@
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_nimf_qt5 INTERFACE IMPORTED GLOBAL) add_library(external_nimf_qt5 INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_nimf_qt5 ALIAS external_nimf_qt5) add_library(desktop-app::external_nimf_qt5 ALIAS external_nimf_qt5)
else() return()
add_library(external_nimf_qt5 STATIC) endif()
add_library(desktop-app::external_nimf_qt5 ALIAS external_nimf_qt5)
init_target(external_nimf_qt5 "(external)")
set(nimf_loc ${third_party_loc}/nimf) add_library(external_nimf_qt5 STATIC)
set(libnimf_src ${nimf_loc}/libnimf) add_library(desktop-app::external_nimf_qt5 ALIAS external_nimf_qt5)
set(nimf_qt5_src ${nimf_loc}/modules/clients/qt5) init_target(external_nimf_qt5 "(external)")
set_target_properties(external_nimf_qt5 PROPERTIES AUTOMOC ON) set(nimf_loc ${third_party_loc}/nimf)
set(libnimf_src ${nimf_loc}/libnimf)
set(nimf_qt5_src ${nimf_loc}/modules/clients/qt5)
nice_target_sources(external_nimf_qt5 ${nimf_qt5_src} set_target_properties(external_nimf_qt5 PROPERTIES AUTOMOC ON)
PRIVATE
nice_target_sources(external_nimf_qt5 ${nimf_qt5_src}
PRIVATE
im-nimf-qt5.cpp im-nimf-qt5.cpp
) )
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(GIO REQUIRED gio-2.0) pkg_check_modules(GIO REQUIRED gio-2.0)
target_include_directories(external_nimf_qt5 target_include_directories(external_nimf_qt5
PRIVATE PRIVATE
${nimf_qt5_src} ${nimf_qt5_src}
${libnimf_src} ${libnimf_src}
${GIO_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS}
) )
target_compile_definitions(external_nimf_qt5 target_compile_definitions(external_nimf_qt5
PRIVATE PRIVATE
QT_STATICPLUGIN QT_STATICPLUGIN
QT_NO_KEYWORDS QT_NO_KEYWORDS
G_LOG_DOMAIN="nimf" G_LOG_DOMAIN="nimf"
NIMF_COMPILATION NIMF_COMPILATION
USE_DLFCN USE_DLFCN
) )
target_link_libraries(external_nimf_qt5 target_link_libraries(external_nimf_qt5
PRIVATE PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
endif()

View file

@ -10,22 +10,23 @@ if (DESKTOP_APP_USE_PACKAGED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
target_link_libraries(external_openssl_crypto INTERFACE OpenSSL::Crypto) target_link_libraries(external_openssl_crypto INTERFACE OpenSSL::Crypto)
else() return()
add_library(external_openssl_crypto STATIC IMPORTED GLOBAL) endif()
add_library(desktop-app::external_openssl_crypto ALIAS external_openssl_crypto)
set_target_properties(external_openssl_crypto PROPERTIES add_library(external_openssl_crypto STATIC IMPORTED GLOBAL)
add_library(desktop-app::external_openssl_crypto ALIAS external_openssl_crypto)
set_target_properties(external_openssl_crypto PROPERTIES
IMPORTED_LOCATION "${openssl_lib_loc}/libcrypto.${openssl_lib_ext}" IMPORTED_LOCATION "${openssl_lib_loc}/libcrypto.${openssl_lib_ext}"
) )
if (WIN32) if (WIN32)
set_target_properties(external_openssl_crypto PROPERTIES set_target_properties(external_openssl_crypto PROPERTIES
IMPORTED_LOCATION_DEBUG "${openssl_lib_loc}.dbg/libcrypto.${openssl_lib_ext}" IMPORTED_LOCATION_DEBUG "${openssl_lib_loc}.dbg/libcrypto.${openssl_lib_ext}"
) )
endif()
target_link_libraries(external_openssl_crypto
INTERFACE
desktop-app::external_openssl_common
)
endif() endif()
target_link_libraries(external_openssl_crypto
INTERFACE
desktop-app::external_openssl_common
)

View file

@ -10,22 +10,23 @@ if (DESKTOP_APP_USE_PACKAGED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
target_link_libraries(external_openssl_ssl INTERFACE OpenSSL::SSL) target_link_libraries(external_openssl_ssl INTERFACE OpenSSL::SSL)
else() return()
add_library(external_openssl_ssl STATIC IMPORTED GLOBAL) endif()
add_library(desktop-app::external_openssl_ssl ALIAS external_openssl_ssl)
set_target_properties(external_openssl_ssl PROPERTIES add_library(external_openssl_ssl STATIC IMPORTED GLOBAL)
add_library(desktop-app::external_openssl_ssl ALIAS external_openssl_ssl)
set_target_properties(external_openssl_ssl PROPERTIES
IMPORTED_LOCATION "${openssl_lib_loc}/libssl.${openssl_lib_ext}" IMPORTED_LOCATION "${openssl_lib_loc}/libssl.${openssl_lib_ext}"
) )
if (WIN32) if (WIN32)
set_target_properties(external_openssl_ssl PROPERTIES set_target_properties(external_openssl_ssl PROPERTIES
IMPORTED_LOCATION_DEBUG "${openssl_lib_loc}.dbg/libssl.${openssl_lib_ext}" IMPORTED_LOCATION_DEBUG "${openssl_lib_loc}.dbg/libssl.${openssl_lib_ext}"
) )
endif()
target_link_libraries(external_openssl_ssl
INTERFACE
desktop-app::external_openssl_common
)
endif() endif()
target_link_libraries(external_openssl_ssl
INTERFACE
desktop-app::external_openssl_common
)

View file

@ -12,11 +12,13 @@ if (DESKTOP_APP_USE_PACKAGED)
pkg_check_modules(OPUS IMPORTED_TARGET opus) pkg_check_modules(OPUS IMPORTED_TARGET opus)
target_link_libraries(external_opus INTERFACE PkgConfig::OPUS) target_link_libraries(external_opus INTERFACE PkgConfig::OPUS)
else() return()
add_library(external_opus STATIC IMPORTED GLOBAL) endif()
add_library(desktop-app::external_opus ALIAS external_opus)
if (WIN32) add_library(external_opus STATIC IMPORTED GLOBAL)
add_library(desktop-app::external_opus ALIAS external_opus)
if (WIN32)
target_include_directories(external_opus SYSTEM target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
${libs_loc}/opus/include ${libs_loc}/opus/include
@ -26,7 +28,7 @@ else()
IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib" IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib"
IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib" IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib"
) )
elseif (APPLE) elseif (APPLE)
target_include_directories(external_opus SYSTEM target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
${libs_loc}/local/include/opus ${libs_loc}/local/include/opus
@ -34,7 +36,7 @@ else()
set_target_properties(external_opus PROPERTIES set_target_properties(external_opus PROPERTIES
IMPORTED_LOCATION ${libs_loc}/local/lib/libopus.a IMPORTED_LOCATION ${libs_loc}/local/lib/libopus.a
) )
else() else()
target_include_directories(external_opus SYSTEM target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
/usr/local/include/opus /usr/local/include/opus
@ -43,5 +45,4 @@ else()
set_target_properties(external_opus PROPERTIES set_target_properties(external_opus PROPERTIES
IMPORTED_LOCATION "${OPUS_LIBRARY}" IMPORTED_LOCATION "${OPUS_LIBRARY}"
) )
endif()
endif() endif()

View file

@ -14,29 +14,28 @@ if (DESKTOP_APP_USE_PACKAGED)
if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS) if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS)
target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${QRCODE_INCLUDE_DIRS}) target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${QRCODE_INCLUDE_DIRS})
target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES}) target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES})
return()
endif() endif()
endif() endif()
if (NOT QRCODE_LIBRARIES OR NOT QRCODE_INCLUDE_DIRS) add_library(external_qr_code_generator_bundled STATIC)
add_library(external_qr_code_generator_bundled STATIC) init_target(external_qr_code_generator_bundled "(external)")
init_target(external_qr_code_generator_bundled "(external)")
set(qr_loc ${third_party_loc}/QR) set(qr_loc ${third_party_loc}/QR)
set(qr_src ${qr_loc}/cpp) set(qr_src ${qr_loc}/cpp)
nice_target_sources(external_qr_code_generator_bundled ${qr_src} nice_target_sources(external_qr_code_generator_bundled ${qr_src}
PRIVATE PRIVATE
qrcodegen.cpp qrcodegen.cpp
qrcodegen.hpp qrcodegen.hpp
) )
target_include_directories(external_qr_code_generator_bundled target_include_directories(external_qr_code_generator_bundled
PUBLIC PUBLIC
${qr_src} ${qr_src}
) )
target_link_libraries(external_qr_code_generator target_link_libraries(external_qr_code_generator
INTERFACE INTERFACE
external_qr_code_generator_bundled external_qr_code_generator_bundled
) )
endif()

View file

@ -50,9 +50,12 @@ if (DESKTOP_APP_USE_PACKAGED)
${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS}
) )
endif() endif()
else()
target_include_directories(external_qt SYSTEM return()
INTERFACE endif()
target_include_directories(external_qt SYSTEM
INTERFACE
${qt_loc}/include ${qt_loc}/include
${qt_loc}/include/QtCore ${qt_loc}/include/QtCore
${qt_loc}/include/QtGui ${qt_loc}/include/QtGui
@ -62,35 +65,35 @@ else()
${qt_loc}/include/QtGui/${qt_version} ${qt_loc}/include/QtGui/${qt_version}
${qt_loc}/include/QtCore/${qt_version}/QtCore ${qt_loc}/include/QtCore/${qt_version}/QtCore
${qt_loc}/include/QtGui/${qt_version}/QtGui ${qt_loc}/include/QtGui/${qt_version}/QtGui
) )
if (Qt5DBus_FOUND) if (Qt5DBus_FOUND)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtDBus ${qt_loc}/include/QtDBus
) )
endif() endif()
if (Qt5XkbCommonSupport_FOUND) if (Qt5XkbCommonSupport_FOUND)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtXkbCommonSupport ${qt_loc}/include/QtXkbCommonSupport
${qt_loc}/include/QtXkbCommonSupport/${qt_version} ${qt_loc}/include/QtXkbCommonSupport/${qt_version}
${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport ${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport
) )
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient ${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
) )
endif() endif()
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
_REENTRANT _REENTRANT
QT_STATICPLUGIN QT_STATICPLUGIN
QT_PLUGIN QT_PLUGIN
@ -99,42 +102,42 @@ else()
QT_GUI_LIB QT_GUI_LIB
QT_CORE_LIB QT_CORE_LIB
QT_SVG_LIB QT_SVG_LIB
) )
if (Qt5DBus_FOUND) if (Qt5DBus_FOUND)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_DBUS_LIB QT_DBUS_LIB
) )
endif() endif()
if (Qt5XkbCommonSupport_FOUND) if (Qt5XkbCommonSupport_FOUND)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_XKBCOMMON_SUPPORT_LIB QT_XKBCOMMON_SUPPORT_LIB
) )
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
) )
endif() endif()
if (WIN32) if (WIN32)
set(qt_lib_prefix "") set(qt_lib_prefix "")
set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib) set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib)
else() else()
set(qt_lib_prefix lib) set(qt_lib_prefix lib)
if (APPLE) if (APPLE)
set(qt_lib_suffix $<$<CONFIG:Debug>:_debug>.a) set(qt_lib_suffix $<$<CONFIG:Debug>:_debug>.a)
else() else()
set(qt_lib_suffix .a) set(qt_lib_suffix .a)
endif() endif()
endif() endif()
set(common_qt_libs set(common_qt_libs
plugins/bearer/${qt_lib_prefix}qgenericbearer plugins/bearer/${qt_lib_prefix}qgenericbearer
plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qwebp
plugins/imageformats/${qt_lib_prefix}qgif plugins/imageformats/${qt_lib_prefix}qgif
@ -150,10 +153,10 @@ else()
lib/${qt_lib_prefix}Qt5Svg lib/${qt_lib_prefix}Qt5Svg
lib/${qt_lib_prefix}qtharfbuzz lib/${qt_lib_prefix}qtharfbuzz
lib/${qt_lib_prefix}qtlibpng lib/${qt_lib_prefix}qtlibpng
) )
set(qt_libs_list "") set(qt_libs_list "")
if (WIN32) if (WIN32)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/mkspecs/win32-msvc ${qt_loc}/mkspecs/win32-msvc
@ -175,7 +178,7 @@ else()
INTERFACE INTERFACE
desktop-app::external_angle desktop-app::external_angle
) )
elseif (APPLE) elseif (APPLE)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/mkspecs/macx-clang ${qt_loc}/mkspecs/macx-clang
@ -196,7 +199,7 @@ else()
INTERFACE INTERFACE
cups cups
) )
else() else()
set(qt_libs_dbus) set(qt_libs_dbus)
set(qt_libs_dbus_support) set(qt_libs_dbus_support)
set(qt_libs_dbus_plugins) set(qt_libs_dbus_plugins)
@ -250,10 +253,10 @@ else()
foreach (lib ${qt_libs}) foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
endforeach() endforeach()
endif() endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
${qt_libs_list} ${qt_libs_list}
desktop-app::external_openssl desktop-app::external_openssl
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<TARGET_FILE:desktop-app::external_openssl_ssl>
@ -261,9 +264,9 @@ else()
desktop-app::external_jpeg desktop-app::external_jpeg
desktop-app::external_zlib desktop-app::external_zlib
$<TARGET_FILE:desktop-app::external_zlib> $<TARGET_FILE:desktop-app::external_zlib>
) )
if (LINUX) if (LINUX)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/mkspecs/linux-g++ ${qt_loc}/mkspecs/linux-g++
@ -307,5 +310,4 @@ else()
X11 X11
X11-xcb X11-xcb
) )
endif()
endif() endif()

View file

@ -38,9 +38,12 @@ if (DESKTOP_APP_USE_PACKAGED)
${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS}
) )
endif() endif()
else()
target_include_directories(external_qt SYSTEM return()
INTERFACE endif()
target_include_directories(external_qt SYSTEM
INTERFACE
${qt_loc}/include ${qt_loc}/include
${qt_loc}/include/QtCore ${qt_loc}/include/QtCore
${qt_loc}/include/QtCore5Compat ${qt_loc}/include/QtCore5Compat
@ -53,26 +56,26 @@ else()
${qt_loc}/include/QtGui/${qt_version} ${qt_loc}/include/QtGui/${qt_version}
${qt_loc}/include/QtCore/${qt_version}/QtCore ${qt_loc}/include/QtCore/${qt_version}/QtCore
${qt_loc}/include/QtGui/${qt_version}/QtGui ${qt_loc}/include/QtGui/${qt_version}/QtGui
) )
if (Qt6DBus_FOUND) if (Qt6DBus_FOUND)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtDBus ${qt_loc}/include/QtDBus
) )
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient ${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
) )
endif() endif()
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
_REENTRANT _REENTRANT
QT_STATICPLUGIN QT_STATICPLUGIN
QT_PLUGIN QT_PLUGIN
@ -84,41 +87,41 @@ else()
QT_GUI_LIB QT_GUI_LIB
QT_CORE5COMPAT_LIB QT_CORE5COMPAT_LIB
QT_CORE_LIB QT_CORE_LIB
) )
if (Qt6DBus_FOUND) if (Qt6DBus_FOUND)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_DBUS_LIB QT_DBUS_LIB
) )
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
) )
endif() endif()
if (WIN32) if (WIN32)
set(qt_lib_prefix "") set(qt_lib_prefix "")
set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib) set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib)
else() else()
set(qt_lib_prefix lib) set(qt_lib_prefix lib)
if (APPLE) if (APPLE)
set(qt_lib_suffix $<$<CONFIG:Debug>:_debug>.a) set(qt_lib_suffix $<$<CONFIG:Debug>:_debug>.a)
else() else()
set(qt_lib_suffix .a) set(qt_lib_suffix .a)
endif() endif()
endif() endif()
if (LINUX) if (LINUX)
set(qt_lib_objects objects-RelWithDebInfo) set(qt_lib_objects objects-RelWithDebInfo)
else() else()
set(qt_lib_objects objects-$<IF:$<CONFIG:Debug>,Debug,RelWithDebInfo>) set(qt_lib_objects objects-$<IF:$<CONFIG:Debug>,Debug,RelWithDebInfo>)
endif() endif()
set(common_qt_libs set(common_qt_libs
plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qwebp
plugins/imageformats/${qt_lib_prefix}qgif plugins/imageformats/${qt_lib_prefix}qgif
plugins/imageformats/${qt_lib_prefix}qjpeg plugins/imageformats/${qt_lib_prefix}qjpeg
@ -133,10 +136,10 @@ else()
lib/${qt_lib_prefix}Qt6BundledHarfbuzz lib/${qt_lib_prefix}Qt6BundledHarfbuzz
lib/${qt_lib_prefix}Qt6BundledLibpng lib/${qt_lib_prefix}Qt6BundledLibpng
lib/${qt_lib_prefix}Qt6BundledPcre2 lib/${qt_lib_prefix}Qt6BundledPcre2
) )
set(qt_libs_list "") set(qt_libs_list "")
if (WIN32) if (WIN32)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/mkspecs/win32-msvc ${qt_loc}/mkspecs/win32-msvc
@ -157,7 +160,7 @@ else()
INTERFACE INTERFACE
desktop-app::external_angle desktop-app::external_angle
) )
elseif (APPLE) elseif (APPLE)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/mkspecs/macx-clang ${qt_loc}/mkspecs/macx-clang
@ -175,7 +178,7 @@ else()
list(APPEND qt_libs_list list(APPEND qt_libs_list
"${qt_loc}/lib/${qt_lib_objects}/QCocoaIntegrationPlugin_resources_1/.rcc/qrc_qcocoaresources.cpp.o" "${qt_loc}/lib/${qt_lib_objects}/QCocoaIntegrationPlugin_resources_1/.rcc/qrc_qcocoaresources.cpp.o"
) )
else() else()
set(qt_libs_dbus) set(qt_libs_dbus)
set(qt_libs_dbus_plugins) set(qt_libs_dbus_plugins)
if (Qt6DBus_FOUND) if (Qt6DBus_FOUND)
@ -219,17 +222,17 @@ else()
foreach (lib ${qt_libs}) foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
endforeach() endforeach()
endif() endif()
list(APPEND qt_libs_list list(APPEND qt_libs_list
"${qt_loc}/lib/${qt_lib_objects}/Gui_resources_1/.rcc/qrc_qpdf.cpp.o" "${qt_loc}/lib/${qt_lib_objects}/Gui_resources_1/.rcc/qrc_qpdf.cpp.o"
"${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_1/.rcc/qrc_qstyle.cpp.o" "${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_1/.rcc/qrc_qstyle.cpp.o"
"${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.o" "${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.o"
"${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.o" "${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.o"
) )
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
${qt_libs_list} ${qt_libs_list}
desktop-app::external_openssl desktop-app::external_openssl
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<TARGET_FILE:desktop-app::external_openssl_ssl>
@ -237,9 +240,9 @@ else()
desktop-app::external_jpeg desktop-app::external_jpeg
desktop-app::external_zlib desktop-app::external_zlib
$<TARGET_FILE:desktop-app::external_zlib> $<TARGET_FILE:desktop-app::external_zlib>
) )
if (LINUX) if (LINUX)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/mkspecs/linux-g++ ${qt_loc}/mkspecs/linux-g++
@ -282,5 +285,4 @@ else()
X11 X11
X11-xcb X11-xcb
) )
endif()
endif() endif()

View file

@ -20,23 +20,25 @@ if (DESKTOP_APP_USE_PACKAGED)
target_link_libraries(external_rlottie INTERFACE PkgConfig::RLOTTIE) target_link_libraries(external_rlottie INTERFACE PkgConfig::RLOTTIE)
endif() endif()
endif() endif()
endif()
if (rlottie_FOUND OR RLOTTIE_FOUND) if (rlottie_FOUND OR RLOTTIE_FOUND)
target_compile_definitions(external_rlottie target_compile_definitions(external_rlottie
INTERFACE INTERFACE
DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_RLOTTIE
) )
else() return()
add_library(external_rlottie_bundled STATIC) endif()
init_target(external_rlottie_bundled "(external)") endif()
get_filename_component(src_loc . REALPATH) add_library(external_rlottie_bundled STATIC)
set(rlottie_loc ${third_party_loc}/rlottie) init_target(external_rlottie_bundled "(external)")
target_sources(external_rlottie_bundled PRIVATE ${src_loc}/config/config.h) get_filename_component(src_loc . REALPATH)
nice_target_sources(external_rlottie_bundled ${rlottie_loc} set(rlottie_loc ${third_party_loc}/rlottie)
PRIVATE
target_sources(external_rlottie_bundled PRIVATE ${src_loc}/config/config.h)
nice_target_sources(external_rlottie_bundled ${rlottie_loc}
PRIVATE
inc/rlottie.h inc/rlottie.h
inc/rlottie_capi.h inc/rlottie_capi.h
inc/rlottiecommon.h inc/rlottiecommon.h
@ -111,38 +113,37 @@ else()
src/vector/vrle.h src/vector/vrle.h
src/vector/vstackallocator.h src/vector/vstackallocator.h
src/vector/vtaskqueue.h src/vector/vtaskqueue.h
) )
target_compile_definitions(external_rlottie_bundled target_compile_definitions(external_rlottie_bundled
PUBLIC PUBLIC
LOT_BUILD LOT_BUILD
PRIVATE PRIVATE
_USE_MATH_DEFINES _USE_MATH_DEFINES
"RAPIDJSON_ASSERT=(void)" "RAPIDJSON_ASSERT=(void)"
LOTTIE_DISABLE_ARM_NEON LOTTIE_DISABLE_ARM_NEON
) )
target_include_directories(external_rlottie_bundled target_include_directories(external_rlottie_bundled
PUBLIC PUBLIC
${rlottie_loc}/inc ${rlottie_loc}/inc
PRIVATE PRIVATE
${src_loc}/config ${src_loc}/config
${rlottie_loc}/src/lottie ${rlottie_loc}/src/lottie
${rlottie_loc}/src/vector ${rlottie_loc}/src/vector
${rlottie_loc}/src/vector/pixman ${rlottie_loc}/src/vector/pixman
${rlottie_loc}/src/vector/freetype ${rlottie_loc}/src/vector/freetype
) )
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
target_compile_options(external_rlottie_bundled target_compile_options(external_rlottie_bundled
PRIVATE PRIVATE
/w44244 # 'initializing': conversion from 'double' to 'float' /w44244 # 'initializing': conversion from 'double' to 'float'
/w44251 # needs to have dll-interface to be used by clients of class /w44251 # needs to have dll-interface to be used by clients of class
) )
endif()
target_link_libraries(external_rlottie
INTERFACE
external_rlottie_bundled
)
endif() endif()
target_link_libraries(external_rlottie
INTERFACE
external_rlottie_bundled
)

View file

@ -12,12 +12,14 @@ if (DESKTOP_APP_USE_PACKAGED)
pkg_check_modules(RNNOISE REQUIRED IMPORTED_TARGET rnnoise) pkg_check_modules(RNNOISE REQUIRED IMPORTED_TARGET rnnoise)
target_link_libraries(external_rnnoise INTERFACE PkgConfig::RNNOISE) target_link_libraries(external_rnnoise INTERFACE PkgConfig::RNNOISE)
else() return()
add_library(external_rnnoise STATIC IMPORTED GLOBAL) endif()
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
set(rnnoise_lib_loc ${libs_loc}/rnnoise/out) add_library(external_rnnoise STATIC IMPORTED GLOBAL)
if (WIN32) add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
set(rnnoise_lib_loc ${libs_loc}/rnnoise/out)
if (WIN32)
target_include_directories(external_rnnoise SYSTEM target_include_directories(external_rnnoise SYSTEM
INTERFACE INTERFACE
${libs_loc}/rnnoise/include ${libs_loc}/rnnoise/include
@ -26,7 +28,7 @@ else()
IMPORTED_LOCATION "${rnnoise_lib_loc}/Release/rnnoise.lib" IMPORTED_LOCATION "${rnnoise_lib_loc}/Release/rnnoise.lib"
IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/rnnoise.lib" IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/rnnoise.lib"
) )
elseif (APPLE) elseif (APPLE)
target_include_directories(external_rnnoise SYSTEM target_include_directories(external_rnnoise SYSTEM
INTERFACE INTERFACE
${libs_loc}/rnnoise/include ${libs_loc}/rnnoise/include
@ -35,7 +37,7 @@ else()
IMPORTED_LOCATION "${rnnoise_lib_loc}/Release/librnnoise.a" IMPORTED_LOCATION "${rnnoise_lib_loc}/Release/librnnoise.a"
IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/librnnoise.a" IMPORTED_LOCATION_DEBUG "${rnnoise_lib_loc}/Debug/librnnoise.a"
) )
else() else()
target_include_directories(external_rnnoise SYSTEM target_include_directories(external_rnnoise SYSTEM
INTERFACE INTERFACE
/usr/local/include /usr/local/include
@ -44,5 +46,4 @@ else()
set_target_properties(external_rnnoise PROPERTIES set_target_properties(external_rnnoise PROPERTIES
IMPORTED_LOCATION "${RNNOISE_LIBRARY}" IMPORTED_LOCATION "${RNNOISE_LIBRARY}"
) )
endif()
endif() endif()

View file

@ -10,12 +10,14 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
find_package(tg_owt REQUIRED) find_package(tg_owt REQUIRED)
target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
else() return()
set(webrtc_loc ${libs_loc}/tg_owt/src) endif()
set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<IF:$<CONFIG:Debug>,Debug,Release>)
target_compile_definitions(external_webrtc set(webrtc_loc ${libs_loc}/tg_owt/src)
INTERFACE set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<IF:$<CONFIG:Debug>,Debug,Release>)
target_compile_definitions(external_webrtc
INTERFACE
WEBRTC_ENABLE_PROTOBUF=0 WEBRTC_ENABLE_PROTOBUF=0
WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE
RTC_ENABLE_VP9 RTC_ENABLE_VP9
@ -26,9 +28,9 @@ else()
WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1 WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1
WEBRTC_HAVE_USRSCTP WEBRTC_HAVE_USRSCTP
ABSL_ALLOCATOR_NOTHROW=1 ABSL_ALLOCATOR_NOTHROW=1
) )
if (WIN32) if (WIN32)
set(webrtc_lib_prefix "") set(webrtc_lib_prefix "")
set(webrtc_lib_suffix .lib) set(webrtc_lib_suffix .lib)
@ -36,7 +38,7 @@ else()
INTERFACE INTERFACE
WEBRTC_WIN WEBRTC_WIN
) )
else() else()
set(webrtc_lib_prefix lib) set(webrtc_lib_prefix lib)
set(webrtc_lib_suffix .a) set(webrtc_lib_suffix .a)
@ -58,49 +60,49 @@ else()
INTERFACE INTERFACE
WEBRTC_POSIX WEBRTC_POSIX
) )
endif() endif()
target_include_directories(external_webrtc SYSTEM target_include_directories(external_webrtc SYSTEM
INTERFACE INTERFACE
${webrtc_loc} ${webrtc_loc}
${webrtc_loc}/third_party/abseil-cpp ${webrtc_loc}/third_party/abseil-cpp
${webrtc_loc}/third_party/libyuv/include ${webrtc_loc}/third_party/libyuv/include
) )
set(webrtc_libs set(webrtc_libs
${webrtc_lib_prefix}tg_owt ${webrtc_lib_prefix}tg_owt
) )
if (APPLE) if (APPLE)
target_include_directories(external_webrtc SYSTEM target_include_directories(external_webrtc SYSTEM
INTERFACE INTERFACE
${webrtc_loc}/sdk/objc ${webrtc_loc}/sdk/objc
${webrtc_loc}/sdk/objc/base ${webrtc_loc}/sdk/objc/base
${webrtc_loc}/sdk/objc/components/video_codec ${webrtc_loc}/sdk/objc/components/video_codec
) )
endif() endif()
foreach (lib ${webrtc_libs}) foreach (lib ${webrtc_libs})
list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}") list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")
endforeach() endforeach()
target_link_libraries(external_webrtc target_link_libraries(external_webrtc
INTERFACE INTERFACE
${webrtc_libs_list} ${webrtc_libs_list}
desktop-app::external_openssl desktop-app::external_openssl
desktop-app::external_jpeg desktop-app::external_jpeg
desktop-app::external_opus desktop-app::external_opus
) )
if (WIN32) if (WIN32)
target_link_libraries(external_webrtc target_link_libraries(external_webrtc
INTERFACE INTERFACE
Secur32.lib # Required for rtc_base/http_common.cc Secur32.lib # Required for rtc_base/http_common.cc
) )
elseif (APPLE) elseif (APPLE)
target_link_libraries(external_webrtc target_link_libraries(external_webrtc
INTERFACE INTERFACE
-ObjC -ObjC
) )
else() else()
# Required for desktop_capture # Required for desktop_capture
target_link_static_libraries(external_webrtc target_link_static_libraries(external_webrtc
INTERFACE INTERFACE
@ -119,5 +121,4 @@ else()
gobject-2.0 gobject-2.0
glib-2.0 glib-2.0
) )
endif()
endif() endif()