From 3182d2d4a7cbfd4290a46ee6baeb3355f5028349 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 6 Dec 2019 11:37:56 +0300 Subject: [PATCH] Add expected and qr_code_generator libraries. --- external/CMakeLists.txt | 2 + external/expected/CMakeLists.txt | 13 ++ external/openssl/CMakeLists.txt | 2 +- external/qr_code_generator/CMakeLists.txt | 27 ++++ external/rlottie/CMakeLists.txt | 145 +++++++++++----------- 5 files changed, 115 insertions(+), 74 deletions(-) create mode 100644 external/expected/CMakeLists.txt create mode 100644 external/qr_code_generator/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 93b469f..4187ad3 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(auto_updates) add_subdirectory(crash_reports) +add_subdirectory(expected) add_subdirectory(ffmpeg) add_subdirectory(gsl) add_subdirectory(iconv) @@ -14,6 +15,7 @@ add_subdirectory(openal) add_subdirectory(openssl) add_subdirectory(opus) add_subdirectory(qt) +add_subdirectory(qr_code_generator) add_subdirectory(ranges) add_subdirectory(rlottie) if (APPLE) diff --git a/external/expected/CMakeLists.txt b/external/expected/CMakeLists.txt new file mode 100644 index 0000000..53ec233 --- /dev/null +++ b/external/expected/CMakeLists.txt @@ -0,0 +1,13 @@ +# 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_expected INTERFACE IMPORTED GLOBAL) +add_library(desktop-app::external_expected ALIAS external_expected) + +target_include_directories(external_expected SYSTEM +INTERFACE + ${third_party_loc}/expected/include +) diff --git a/external/openssl/CMakeLists.txt b/external/openssl/CMakeLists.txt index 9c67afa..244d435 100644 --- a/external/openssl/CMakeLists.txt +++ b/external/openssl/CMakeLists.txt @@ -44,12 +44,12 @@ target_link_libraries(external_openssl INTERFACE ${openssl_lib_loc}/libssl.${openssl_lib_ext} ${openssl_lib_loc}/libcrypto.${openssl_lib_ext} - pthread ) if (LINUX) target_link_libraries(external_openssl INTERFACE desktop-app::linux_glibc_wraps + pthread ) endif() diff --git a/external/qr_code_generator/CMakeLists.txt b/external/qr_code_generator/CMakeLists.txt new file mode 100644 index 0000000..0f81125 --- /dev/null +++ b/external/qr_code_generator/CMakeLists.txt @@ -0,0 +1,27 @@ +# 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_qr_code_generator OBJECT) +add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator) +init_target(external_qr_code_generator "(external)") + +set(qr_loc ${third_party_loc}/QR) +set(qr_src ${qr_loc}/cpp) + +nice_target_sources(external_qr_code_generator ${qr_src} +PRIVATE + BitBuffer.cpp + BitBuffer.hpp + QrCode.cpp + QrCode.hpp + QrSegment.cpp + QrSegment.hpp +) + +target_include_directories(external_qr_code_generator +PUBLIC + ${qr_src} +) diff --git a/external/rlottie/CMakeLists.txt b/external/rlottie/CMakeLists.txt index 038c5da..4fc3a54 100644 --- a/external/rlottie/CMakeLists.txt +++ b/external/rlottie/CMakeLists.txt @@ -11,84 +11,83 @@ init_target(external_rlottie "(external)") get_filename_component(src_loc . REALPATH) set(rlottie_loc ${third_party_loc}/rlottie) -target_sources(external_rlottie +target_sources(external_rlottie PRIVATE ${src_loc}/config/config.h) +nice_target_sources(external_rlottie ${rlottie_loc} PRIVATE - ${src_loc}/config/config.h + inc/rlottie.h + inc/rlottie_capi.h + inc/rlottiecommon.h - ${rlottie_loc}/inc/rlottie.h - ${rlottie_loc}/inc/rlottie_capi.h - ${rlottie_loc}/inc/rlottiecommon.h + src/lottie/lottieanimation.cpp + src/lottie/lottieitem.cpp + src/lottie/lottieitem.h + src/lottie/lottiekeypath.cpp + src/lottie/lottiekeypath.h + src/lottie/lottieloader.cpp + src/lottie/lottieloader.h + src/lottie/lottiemodel.cpp + src/lottie/lottiemodel.h + src/lottie/lottieparser.cpp + src/lottie/lottieparser.h + src/lottie/lottieproxymodel.cpp + src/lottie/lottieproxymodel.h - ${rlottie_loc}/src/lottie/lottieanimation.cpp - ${rlottie_loc}/src/lottie/lottieitem.cpp - ${rlottie_loc}/src/lottie/lottieitem.h - ${rlottie_loc}/src/lottie/lottiekeypath.cpp - ${rlottie_loc}/src/lottie/lottiekeypath.h - ${rlottie_loc}/src/lottie/lottieloader.cpp - ${rlottie_loc}/src/lottie/lottieloader.h - ${rlottie_loc}/src/lottie/lottiemodel.cpp - ${rlottie_loc}/src/lottie/lottiemodel.h - ${rlottie_loc}/src/lottie/lottieparser.cpp - ${rlottie_loc}/src/lottie/lottieparser.h - ${rlottie_loc}/src/lottie/lottieproxymodel.cpp - ${rlottie_loc}/src/lottie/lottieproxymodel.h + src/vector/freetype/v_ft_math.cpp + src/vector/freetype/v_ft_math.h + src/vector/freetype/v_ft_raster.cpp + src/vector/freetype/v_ft_raster.h + src/vector/freetype/v_ft_stroker.cpp + src/vector/freetype/v_ft_stroker.h + src/vector/freetype/v_ft_types.h - ${rlottie_loc}/src/vector/freetype/v_ft_math.cpp - ${rlottie_loc}/src/vector/freetype/v_ft_math.h - ${rlottie_loc}/src/vector/freetype/v_ft_raster.cpp - ${rlottie_loc}/src/vector/freetype/v_ft_raster.h - ${rlottie_loc}/src/vector/freetype/v_ft_stroker.cpp - ${rlottie_loc}/src/vector/freetype/v_ft_stroker.h - ${rlottie_loc}/src/vector/freetype/v_ft_types.h + # src/vector/pixman/pixman-arm-neon-asm.h + # src/vector/pixman/pixman-arm-neon-asm.S + src/vector/pixman/vregion.cpp + src/vector/pixman/vregion.h - # ${rlottie_loc}/src/vector/pixman/pixman-arm-neon-asm.h - # ${rlottie_loc}/src/vector/pixman/pixman-arm-neon-asm.S - ${rlottie_loc}/src/vector/pixman/vregion.cpp - ${rlottie_loc}/src/vector/pixman/vregion.h - - ${rlottie_loc}/src/vector/vbezier.cpp - ${rlottie_loc}/src/vector/vbezier.h - ${rlottie_loc}/src/vector/vbitmap.cpp - ${rlottie_loc}/src/vector/vbitmap.h - ${rlottie_loc}/src/vector/vbrush.cpp - ${rlottie_loc}/src/vector/vbrush.h - ${rlottie_loc}/src/vector/vcompositionfunctions.cpp - ${rlottie_loc}/src/vector/vcowptr.h - ${rlottie_loc}/src/vector/vdasher.cpp - ${rlottie_loc}/src/vector/vdasher.h - ${rlottie_loc}/src/vector/vdebug.cpp - ${rlottie_loc}/src/vector/vdebug.h - ${rlottie_loc}/src/vector/vdrawable.cpp - ${rlottie_loc}/src/vector/vdrawable.h - ${rlottie_loc}/src/vector/vdrawhelper.cpp - ${rlottie_loc}/src/vector/vdrawhelper.h - ${rlottie_loc}/src/vector/vdrawhelper_neon.cpp - ${rlottie_loc}/src/vector/vdrawhelper_sse2.cpp - ${rlottie_loc}/src/vector/velapsedtimer.cpp - ${rlottie_loc}/src/vector/velapsedtimer.h - ${rlottie_loc}/src/vector/vglobal.h - ${rlottie_loc}/src/vector/vimageloader.cpp - ${rlottie_loc}/src/vector/vimageloader.h - ${rlottie_loc}/src/vector/vinterpolator.cpp - ${rlottie_loc}/src/vector/vinterpolator.h - ${rlottie_loc}/src/vector/vline.h - ${rlottie_loc}/src/vector/vmatrix.cpp - ${rlottie_loc}/src/vector/vmatrix.h - ${rlottie_loc}/src/vector/vpainter.cpp - ${rlottie_loc}/src/vector/vpainter.h - ${rlottie_loc}/src/vector/vpath.cpp - ${rlottie_loc}/src/vector/vpath.h - ${rlottie_loc}/src/vector/vpathmesure.cpp - ${rlottie_loc}/src/vector/vpathmesure.h - ${rlottie_loc}/src/vector/vpoint.h - ${rlottie_loc}/src/vector/vraster.cpp - ${rlottie_loc}/src/vector/vraster.h - ${rlottie_loc}/src/vector/vrect.cpp - ${rlottie_loc}/src/vector/vrect.h - ${rlottie_loc}/src/vector/vrle.cpp - ${rlottie_loc}/src/vector/vrle.h - ${rlottie_loc}/src/vector/vstackallocator.h - ${rlottie_loc}/src/vector/vtaskqueue.h + src/vector/vbezier.cpp + src/vector/vbezier.h + src/vector/vbitmap.cpp + src/vector/vbitmap.h + src/vector/vbrush.cpp + src/vector/vbrush.h + src/vector/vcompositionfunctions.cpp + src/vector/vcowptr.h + src/vector/vdasher.cpp + src/vector/vdasher.h + src/vector/vdebug.cpp + src/vector/vdebug.h + src/vector/vdrawable.cpp + src/vector/vdrawable.h + src/vector/vdrawhelper.cpp + src/vector/vdrawhelper.h + src/vector/vdrawhelper_neon.cpp + src/vector/vdrawhelper_sse2.cpp + src/vector/velapsedtimer.cpp + src/vector/velapsedtimer.h + src/vector/vglobal.h + src/vector/vimageloader.cpp + src/vector/vimageloader.h + src/vector/vinterpolator.cpp + src/vector/vinterpolator.h + src/vector/vline.h + src/vector/vmatrix.cpp + src/vector/vmatrix.h + src/vector/vpainter.cpp + src/vector/vpainter.h + src/vector/vpath.cpp + src/vector/vpath.h + src/vector/vpathmesure.cpp + src/vector/vpathmesure.h + src/vector/vpoint.h + src/vector/vraster.cpp + src/vector/vraster.h + src/vector/vrect.cpp + src/vector/vrect.h + src/vector/vrle.cpp + src/vector/vrle.h + src/vector/vstackallocator.h + src/vector/vtaskqueue.h ) target_compile_definitions(external_rlottie