From 68438bb43d600005acf215c80fb940508a4507b0 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 4 Oct 2020 07:26:53 +0400 Subject: [PATCH 01/10] Add desktop-app::external_glib --- external/CMakeLists.txt | 3 ++ external/glib/CMakeLists.txt | 36 +++++++++++++++++++ .../hime_qt/hime_im_client/CMakeLists.txt | 10 +++--- external/nimf_qt5/CMakeLists.txt | 9 +---- 4 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 external/glib/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 5882bbb..2d79326 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -22,6 +22,9 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) add_checked_subdirectory(fcitx5_qt5) endif() add_checked_subdirectory(ffmpeg) +if (LINUX) + add_checked_subdirectory(glib) +endif() add_checked_subdirectory(gsl) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) add_checked_subdirectory(hime_qt) diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt new file mode 100644 index 0000000..55c277e --- /dev/null +++ b/external/glib/CMakeLists.txt @@ -0,0 +1,36 @@ +# This file is part of Desktop App Toolkit, +# a set of libraries for developing nice desktop applications. +# +# For license and copyright information please follow this link: +# https://github.com/desktop-app/legal/blob/master/LEGAL + +add_library(external_glib INTERFACE IMPORTED GLOBAL) +add_library(desktop-app::external_glib ALIAS external_glib) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GOBJECT REQUIRED IMPORTED_TARGET gobject-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +if (DESKTOP_APP_USE_PACKAGED) + target_link_libraries(external_glib + INTERFACE + PkgConfig::GIO + PkgConfig::GOBJECT + PkgConfig::GLIB2 + ) +else() + target_include_directories(external_glib + INTERFACE + ${GIO_INCLUDE_DIRS} + ${GOBJECT_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIRS} + ) + + target_link_libraries(external_glib + INTERFACE + gio-2.0 + gobject-2.0 + glib-2.0 + ) +endif() diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt index 72d7bea..c90c717 100644 --- a/external/hime_qt/hime_im_client/CMakeLists.txt +++ b/external/hime_qt/hime_im_client/CMakeLists.txt @@ -54,29 +54,29 @@ else() CLIENT_LIB=1 ) + target_link_libraries(external_hime_im_client + PRIVATE + desktop-app::external_glib + ) + if (DESKTOP_APP_USE_PACKAGED) pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) - pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) target_link_libraries(external_hime_im_client PRIVATE PkgConfig::X11 - PkgConfig::GLIB2 ) else() pkg_check_modules(X11 REQUIRED x11) - pkg_check_modules(GLIB2 REQUIRED glib-2.0) target_include_directories(external_hime_im_client PRIVATE ${X11_INCLUDE_DIRS} - ${GLIB2_INCLUDE_DIRS} ) target_link_libraries(external_hime_im_client PRIVATE X11 - glib-2.0 ) endif() endif() diff --git a/external/nimf_qt5/CMakeLists.txt b/external/nimf_qt5/CMakeLists.txt index 6e2eee3..57f52a6 100644 --- a/external/nimf_qt5/CMakeLists.txt +++ b/external/nimf_qt5/CMakeLists.txt @@ -23,18 +23,10 @@ else() im-nimf-qt5.cpp ) - find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 REQUIRED glib-2.0) - pkg_check_modules(GOBJECT REQUIRED gobject-2.0) - pkg_check_modules(GIO REQUIRED gio-2.0) - target_include_directories(external_nimf_qt5 PRIVATE ${nimf_qt5_src} ${libnimf_src} - ${GLIB2_INCLUDE_DIRS} - ${GOBJECT_INCLUDE_DIRS} - ${GIO_INCLUDE_DIRS} ) target_compile_definitions(external_nimf_qt5 @@ -49,6 +41,7 @@ else() target_link_libraries(external_nimf_qt5 PRIVATE desktop-app::external_qt + desktop-app::external_glib ${CMAKE_DL_LIBS} ) endif() From 001c41a6be93656ef3a06a917afbdda93eadb743 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 4 Oct 2020 07:37:34 +0400 Subject: [PATCH 02/10] Add desktop-app::external_xcb --- external/CMakeLists.txt | 3 +++ external/fcitx5_qt5/CMakeLists.txt | 9 +-------- external/xcb/CMakeLists.txt | 18 ++++++++++++++++++ external/xcb/xcb_screensaver/CMakeLists.txt | 16 ++++++++++++++++ 4 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 external/xcb/CMakeLists.txt create mode 100644 external/xcb/xcb_screensaver/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 2d79326..2fd24d9 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -65,5 +65,8 @@ add_checked_subdirectory(variant) if (NOT DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION) add_checked_subdirectory(webrtc) endif() +if (LINUX) + add_checked_subdirectory(xcb) +endif() add_checked_subdirectory(xxhash) add_checked_subdirectory(zlib) diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt5/CMakeLists.txt index 3a7d26a..98e4cc9 100644 --- a/external/fcitx5_qt5/CMakeLists.txt +++ b/external/fcitx5_qt5/CMakeLists.txt @@ -46,12 +46,12 @@ else() PRIVATE desktop-app::external_fcitx5_qt5_dbusaddons desktop-app::external_qt + desktop-app::external_xcb ) if (DESKTOP_APP_USE_PACKAGED) find_package(PkgConfig REQUIRED) pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon) - pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb) target_link_libraries(external_fcitx5_qt5 PRIVATE @@ -61,22 +61,15 @@ else() else() find_package(PkgConfig REQUIRED) pkg_check_modules(XKBCOMMON REQUIRED xkbcommon) - pkg_check_modules(XCB REQUIRED xcb) target_include_directories(external_fcitx5_qt5 PUBLIC ${XKBCOMMON_INCLUDE_DIRS} - ${XCB_INCLUDE_DIRS} ) target_link_static_libraries(external_fcitx5_qt5 PRIVATE xkbcommon ) - - target_link_libraries(external_fcitx5_qt5 - PRIVATE - xcb - ) endif() endif() diff --git a/external/xcb/CMakeLists.txt b/external/xcb/CMakeLists.txt new file mode 100644 index 0000000..d413d1e --- /dev/null +++ b/external/xcb/CMakeLists.txt @@ -0,0 +1,18 @@ +# This file is part of Desktop App Toolkit, +# a set of libraries for developing nice desktop applications. +# +# For license and copyright information please follow this link: +# https://github.com/desktop-app/legal/blob/master/LEGAL + +add_library(external_xcb INTERFACE IMPORTED GLOBAL) +add_library(desktop-app::external_xcb ALIAS external_xcb) + +add_subdirectory(xcb_screensaver) + +if (DESKTOP_APP_USE_PACKAGED) + find_package(PkgConfig REQUIRED) + pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb) + target_link_libraries(external_xcb INTERFACE PkgConfig::XCB) +else() + target_link_libraries(external_xcb INTERFACE xcb) +endif() diff --git a/external/xcb/xcb_screensaver/CMakeLists.txt b/external/xcb/xcb_screensaver/CMakeLists.txt new file mode 100644 index 0000000..20617d1 --- /dev/null +++ b/external/xcb/xcb_screensaver/CMakeLists.txt @@ -0,0 +1,16 @@ +# This file is part of Desktop App Toolkit, +# a set of libraries for developing nice desktop applications. +# +# For license and copyright information please follow this link: +# https://github.com/desktop-app/legal/blob/master/LEGAL + +add_library(external_xcb_screensaver INTERFACE IMPORTED GLOBAL) +add_library(desktop-app::external_xcb_screensaver ALIAS external_xcb_screensaver) + +if (DESKTOP_APP_USE_PACKAGED) + find_package(PkgConfig REQUIRED) + pkg_check_modules(XCB_SCREENSAVER REQUIRED IMPORTED_TARGET xcb-screensaver) + target_link_libraries(external_xcb_screensaver INTERFACE PkgConfig::XCB_SCREENSAVER) +else() + target_link_static_libraries(external_xcb_screensaver INTERFACE xcb-screensaver) +endif() From 917f3d69ba320038bfd172cb5d08647f635655e7 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 14 Oct 2020 13:40:15 +0400 Subject: [PATCH 03/10] Add opus and zlib source directoies as include directories only on Windows --- external/opus/CMakeLists.txt | 10 ++++------ external/zlib/CMakeLists.txt | 10 +--------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt index 60a01c5..4b452e5 100644 --- a/external/opus/CMakeLists.txt +++ b/external/opus/CMakeLists.txt @@ -16,14 +16,12 @@ else() add_library(external_opus STATIC IMPORTED GLOBAL) add_library(desktop-app::external_opus ALIAS external_opus) - target_include_directories(external_opus SYSTEM - INTERFACE - ${libs_loc}/opus/include - ) - if (WIN32) + target_include_directories(external_opus + INTERFACE + ${libs_loc}/opus/include + ) set(opus_lib_loc ${libs_loc}/opus/win32/VS2015/Win32) - set_target_properties(external_opus PROPERTIES IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib" IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib" diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index 0389c0d..34e4874 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -7,21 +7,13 @@ add_library(external_zlib INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_zlib ALIAS external_zlib) -if (NOT DESKTOP_APP_USE_PACKAGED AND NOT LINUX) - target_include_directories(external_zlib SYSTEM - INTERFACE - ${libs_loc}/zlib - ) -endif() - if (DESKTOP_APP_USE_PACKAGED) find_package(ZLIB REQUIRED) target_link_libraries(external_zlib INTERFACE ZLIB::ZLIB) elseif (WIN32) target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI) - + target_include_directories(external_zlib INTERFACE ${libs_loc}/zlib) set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/x86/ZlibStat$,Debug,ReleaseWithoutAsm>) - target_link_libraries(external_zlib INTERFACE ${zlib_lib_loc}/zlibstat.lib) elseif (APPLE AND NOT build_osx) target_link_libraries(external_zlib INTERFACE /usr/local/macos/lib/libz.a) From e5af534f94f5fb35a66a1ab837d74a57f30f2287 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 12 Oct 2020 16:15:13 +0400 Subject: [PATCH 04/10] Get rid of lxqt-qtplugin --- external/CMakeLists.txt | 3 - external/lxqt_qtplugin/CMakeLists.txt | 48 --------------- .../xdgiconloader/CMakeLists.txt | 59 ------------------- 3 files changed, 110 deletions(-) delete mode 100644 external/lxqt_qtplugin/CMakeLists.txt delete mode 100644 external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 2fd24d9..4e86522 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -33,9 +33,6 @@ if (add_hunspell_library) add_checked_subdirectory(hunspell) endif() add_checked_subdirectory(iconv) -if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) - add_checked_subdirectory(lxqt_qtplugin) -endif() add_checked_subdirectory(lz4) if (LINUX) add_checked_subdirectory(materialdecoration) diff --git a/external/lxqt_qtplugin/CMakeLists.txt b/external/lxqt_qtplugin/CMakeLists.txt deleted file mode 100644 index 8796cde..0000000 --- a/external/lxqt_qtplugin/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# This file is part of Desktop App Toolkit, -# a set of libraries for developing nice desktop applications. -# -# For license and copyright information please follow this link: -# https://github.com/desktop-app/legal/blob/master/LEGAL - -if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) - add_library(external_lxqt_qtplugin INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_lxqt_qtplugin ALIAS external_lxqt_qtplugin) -else() - add_library(external_lxqt_qtplugin STATIC) - add_library(desktop-app::external_lxqt_qtplugin ALIAS external_lxqt_qtplugin) - init_target(external_lxqt_qtplugin "(external)") - - set(lxqt_qtplugin_loc ${third_party_loc}/lxqt-qtplugin) - set(lxqt_qtplugin_src ${lxqt_qtplugin_loc}/src) - - set_target_properties(external_lxqt_qtplugin PROPERTIES AUTOMOC ON) - - nice_target_sources(external_lxqt_qtplugin ${lxqt_qtplugin_src} - PRIVATE - main.cpp - lxqtplatformtheme.cpp - lxqtplatformtheme.h - lxqtsystemtrayicon.cpp - lxqtsystemtrayicon.h - ) - - target_include_directories(external_lxqt_qtplugin - PRIVATE - ${lxqt_qtplugin_src} - ) - - target_compile_definitions(external_lxqt_qtplugin - PRIVATE - QT_STATICPLUGIN - QT_NO_FOREACH - LIB_FM_QT_SONAME="libfm-qt.so.7" - ) - - add_subdirectory(xdgiconloader) - target_link_libraries(external_lxqt_qtplugin - PRIVATE - desktop-app::external_statusnotifieritem - desktop-app::external_xdgiconloader - desktop-app::external_qt - ) -endif() diff --git a/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt b/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt deleted file mode 100644 index 992b3c6..0000000 --- a/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -# This file is part of Desktop App Toolkit, -# a set of libraries for developing nice desktop applications. -# -# For license and copyright information please follow this link: -# https://github.com/desktop-app/legal/blob/master/LEGAL - -if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) - add_library(external_xdgiconloader INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) -else() - add_library(external_xdgiconloader STATIC) - add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) - init_target(external_xdgiconloader "(external)") - - set(libqtxdg_loc ${third_party_loc}/libqtxdg) - set(xdgiconloader_src ${libqtxdg_loc}/src/xdgiconloader) - set(xdgiconloader_includedir "${CMAKE_CURRENT_BINARY_DIR}/xdgiconloader") - - set_target_properties(external_xdgiconloader PROPERTIES AUTOMOC ON) - - nice_target_sources(external_xdgiconloader ${xdgiconloader_src} - PRIVATE - xdgiconloader.cpp - xdgiconloader_p.h - ) - - include(GenerateExportHeader) - generate_export_header(external_xdgiconloader BASE_NAME XdgIconLoader) - - configure_file( - "${CMAKE_CURRENT_BINARY_DIR}/xdgiconloader_export.h" - "${xdgiconloader_includedir}/xdgiconloader_export.h" - COPYONLY - ) - - file( - COPY - ${xdgiconloader_src}/xdgiconloader_p.h - DESTINATION - ${xdgiconloader_includedir}/private/xdgiconloader - ) - - target_include_directories(external_xdgiconloader - PUBLIC - ${xdgiconloader_includedir} - PRIVATE - ${xdgiconloader_src} - ) - - target_compile_definitions(external_xdgiconloader - PRIVATE - QT_NO_KEYWORDS - ) - - target_link_libraries(external_xdgiconloader - PRIVATE - desktop-app::external_qt - ) -endif() From 18bf821e506749afdd9826836adb38ffae0ea454 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 12 Oct 2020 16:30:39 +0400 Subject: [PATCH 05/10] Add missing REQUIRED when finding QtThemeSupport --- external/qt/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 6a379a6..5cfbe35 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -34,6 +34,7 @@ if (DESKTOP_APP_USE_PACKAGED) find_library(Qt5ThemeSupport_LIBRARY NAMES Qt5ThemeSupport + REQUIRED ) find_path(Qt5ThemeSupport_INCLUDE_DIR @@ -43,6 +44,7 @@ if (DESKTOP_APP_USE_PACKAGED) ${Qt5Gui_INCLUDE_DIRS} PATH_SUFFIXES QtThemeSupport/${Qt5Gui_VERSION} + REQUIRED ) target_link_libraries(external_qt From b485d43a45eec75b8cbc0ab966ab3c06b5e8bac8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 23 Oct 2020 14:06:26 +0400 Subject: [PATCH 06/10] Opus headers are in opus subfolder --- external/opus/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt index 4b452e5..527902b 100644 --- a/external/opus/CMakeLists.txt +++ b/external/opus/CMakeLists.txt @@ -29,7 +29,7 @@ else() elseif (APPLE AND NOT build_osx) target_include_directories(external_opus INTERFACE - /usr/local/macos/include + /usr/local/macos/include/opus ) set_target_properties(external_opus PROPERTIES IMPORTED_LOCATION /usr/local/macos/lib/libopus.a @@ -37,12 +37,16 @@ else() elseif (APPLE) target_include_directories(external_opus INTERFACE - /usr/local/include + /usr/local/include/opus ) set_target_properties(external_opus PROPERTIES IMPORTED_LOCATION /usr/local/lib/libopus.a ) else() + target_include_directories(external_opus + INTERFACE + /usr/local/include/opus + ) find_library(OPUS_LIBRARY libopus.a) set_target_properties(external_opus PROPERTIES IMPORTED_LOCATION "${OPUS_LIBRARY}" From cfc6051fb65da4c67ccbc2a1d9e753758f995fe3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 23 Oct 2020 17:48:52 +0300 Subject: [PATCH 07/10] Remove XCB from fcitx5_qt5 dependencies. --- external/fcitx5_qt5/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt5/CMakeLists.txt index 98e4cc9..128e0a1 100644 --- a/external/fcitx5_qt5/CMakeLists.txt +++ b/external/fcitx5_qt5/CMakeLists.txt @@ -56,7 +56,6 @@ else() target_link_libraries(external_fcitx5_qt5 PRIVATE PkgConfig::XKBCOMMON - PkgConfig::XCB ) else() find_package(PkgConfig REQUIRED) From 84ce1c5c65d84d22632ff4fc0e3637e9b3b63eb7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Oct 2020 14:24:50 +0300 Subject: [PATCH 08/10] Use RelWithDebInfo for OpenAL on Windows. --- external/openal/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/openal/CMakeLists.txt b/external/openal/CMakeLists.txt index 6662a2d..2b3a2d1 100644 --- a/external/openal/CMakeLists.txt +++ b/external/openal/CMakeLists.txt @@ -25,7 +25,7 @@ elseif (WIN32) ) target_link_libraries(external_openal INTERFACE - ${libs_loc}/openal-soft/build/$,Debug,Release>/OpenAL32.lib + ${libs_loc}/openal-soft/build/$,Debug,RelWithDebInfo>/OpenAL32.lib ) elseif(APPLE AND NOT build_osx) target_include_directories(external_openal SYSTEM From ed9fa2e798a1f175840479417d760c51181959b8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 7 Oct 2020 06:19:33 +0400 Subject: [PATCH 09/10] Add external_jpeg --- external/CMakeLists.txt | 1 + external/jpeg/CMakeLists.txt | 22 ++++++++++++++++++++++ external/qt/CMakeLists.txt | 7 +++++++ external/webrtc/CMakeLists.txt | 1 + 4 files changed, 31 insertions(+) create mode 100644 external/jpeg/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 4e86522..7cd03d6 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -33,6 +33,7 @@ if (add_hunspell_library) add_checked_subdirectory(hunspell) endif() add_checked_subdirectory(iconv) +add_checked_subdirectory(jpeg) add_checked_subdirectory(lz4) if (LINUX) add_checked_subdirectory(materialdecoration) diff --git a/external/jpeg/CMakeLists.txt b/external/jpeg/CMakeLists.txt new file mode 100644 index 0000000..f35a126 --- /dev/null +++ b/external/jpeg/CMakeLists.txt @@ -0,0 +1,22 @@ +# This file is part of Desktop App Toolkit, +# a set of libraries for developing nice desktop applications. +# +# For license and copyright information please follow this link: +# https://github.com/desktop-app/legal/blob/master/LEGAL + +add_library(external_jpeg INTERFACE IMPORTED GLOBAL) +add_library(desktop-app::external_jpeg ALIAS external_jpeg) + +if (DESKTOP_APP_USE_PACKAGED) + find_package(JPEG) + target_link_libraries(external_jpeg INTERFACE JPEG::JPEG) +elseif (WIN32) + target_include_directories(external_jpeg INTERFACE ${libs_loc}/mozjpeg) + target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$,Debug,Release>/jpeg-static.lib) +elseif (APPLE AND NOT build_osx) + target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a) +elseif (APPLE) + target_link_libraries(external_jpeg INTERFACE /usr/local/lib/libjpeg.a) +else() + target_link_static_libraries(external_jpeg INTERFACE jpeg) +endif() diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 5cfbe35..110c3fd 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -202,6 +202,11 @@ else() foreach (lib ${qt_libs}) list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") endforeach() + target_link_libraries(external_qt + INTERFACE + desktop-app::external_jpeg + desktop-app::external_zlib + ) elseif (APPLE) if (NOT build_osx) set(qt_libs @@ -235,6 +240,7 @@ else() endforeach() target_link_libraries(external_qt INTERFACE + desktop-app::external_jpeg desktop-app::external_zlib cups ) @@ -354,6 +360,7 @@ else() endif() target_link_libraries(external_qt INTERFACE + desktop-app::external_jpeg desktop-app::external_zlib ICE SM diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt index a354057..8adb2d2 100644 --- a/external/webrtc/CMakeLists.txt +++ b/external/webrtc/CMakeLists.txt @@ -98,5 +98,6 @@ else() INTERFACE ${webrtc_libs_list} desktop-app::external_openssl + desktop-app::external_jpeg ) endif() From a7e73ebc036fdf32cdca56b62405bf9dcd8f8f09 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 26 Oct 2020 04:14:24 +0300 Subject: [PATCH 10/10] Reverted CXX standard to latest on Apple Clang. Related commit: 5d6f8ebee3. --- init_target.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init_target.cmake b/init_target.cmake index fc299bb..3a4806b 100644 --- a/init_target.cmake +++ b/init_target.cmake @@ -5,7 +5,7 @@ # https://github.com/desktop-app/legal/blob/master/LEGAL set(MAXIMUM_CXX_STANDARD cxx_std_20) -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(MAXIMUM_CXX_STANDARD cxx_std_17) endif()