kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Updated cmake sources to TDesktop version 2.8.11+b2c762e

Browse source
This commit is contained in:
Eric Kotato 2021-07-20 06:53:29 +03:00
commit cbf0e42029
25 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/angle/CMakeLists.txt vendored
View file

@ -8,7 +8,7 @@ add_library(external_angle INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_angle ALIAS external_angle) add_library(desktop-app::external_angle ALIAS external_angle)
if (WIN32) if (WIN32)
target_include_directories(external_angle target_include_directories(external_angle SYSTEM
INTERFACE INTERFACE
${libs_loc}/tg_angle/include ${libs_loc}/tg_angle/include
) )

4
external/auto_updates/xz/CMakeLists.txt vendored
View file

@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED)
find_package(LibLZMA REQUIRED) find_package(LibLZMA REQUIRED)
target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA) target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA)
elseif (APPLE AND NOT build_osx) elseif (APPLE AND NOT build_osx)
target_include_directories(external_xz target_include_directories(external_xz SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include /usr/local/macos/include
) )
@ -20,7 +20,7 @@ elseif (APPLE AND NOT build_osx)
/usr/local/macos/lib/liblzma.a /usr/local/macos/lib/liblzma.a
) )
elseif (APPLE) elseif (APPLE)
target_include_directories(external_xz target_include_directories(external_xz SYSTEM
INTERFACE INTERFACE
/usr/local/include /usr/local/include
) )

2
external/fcitx5_qt5/CMakeLists.txt vendored
View file

@ -67,7 +67,7 @@ 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 target_include_directories(external_fcitx5_qt5 SYSTEM
PUBLIC PUBLIC
${XKBCOMMON_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS}
) )

2
external/ffmpeg/CMakeLists.txt vendored
View file

@ -17,7 +17,7 @@ if (DESKTOP_APP_USE_PACKAGED)
pkg_check_modules(SWRESAMPLE REQUIRED IMPORTED_TARGET libswresample) pkg_check_modules(SWRESAMPLE REQUIRED IMPORTED_TARGET libswresample)
if (DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC) if (DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC)
target_include_directories(external_ffmpeg target_include_directories(external_ffmpeg SYSTEM
INTERFACE INTERFACE
${AVCODEC_STATIC_INCLUDE_DIRS} ${AVCODEC_STATIC_INCLUDE_DIRS}
${AVFORMAT_STATIC_INCLUDE_DIRS} ${AVFORMAT_STATIC_INCLUDE_DIRS}

2
external/glib/CMakeLists.txt vendored
View file

@ -22,7 +22,7 @@ if (DESKTOP_APP_USE_PACKAGED)
PkgConfig::GLIB2 PkgConfig::GLIB2
) )
else() else()
target_include_directories(external_glib target_include_directories(external_glib SYSTEM
INTERFACE INTERFACE
${GIO_UNIX_INCLUDE_DIRS} ${GIO_UNIX_INCLUDE_DIRS}
${GIO_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS}

2
external/glibmm/CMakeLists.txt vendored
View file

@ -18,7 +18,7 @@ if (DESKTOP_APP_USE_PACKAGED)
PkgConfig::GLIBMM PkgConfig::GLIBMM
) )
else() else()
target_include_directories(external_glibmm target_include_directories(external_glibmm SYSTEM
INTERFACE INTERFACE
${GIOMM_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS}
${GLIBMM_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}

2
external/hime_qt/hime_im_client/CMakeLists.txt vendored
View file

@ -84,7 +84,7 @@ else()
else() else()
pkg_check_modules(X11 REQUIRED x11) pkg_check_modules(X11 REQUIRED x11)
target_include_directories(external_hime_im_client target_include_directories(external_hime_im_client SYSTEM
PRIVATE PRIVATE
${X11_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}
) )

2
external/jemalloc/CMakeLists.txt vendored
View file

@ -35,7 +35,7 @@ if (NOT JEMALLOC_FOUND)
IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc.a" IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc.a"
) )
target_include_directories(external_jemalloc_bundled target_include_directories(external_jemalloc_bundled SYSTEM
INTERFACE INTERFACE
${SOURCE_DIR}/include ${SOURCE_DIR}/include
) )

2
external/jpeg/CMakeLists.txt vendored
View file

@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED)
find_package(JPEG) find_package(JPEG)
target_link_libraries(external_jpeg INTERFACE JPEG::JPEG) target_link_libraries(external_jpeg INTERFACE JPEG::JPEG)
elseif (WIN32) elseif (WIN32)
target_include_directories(external_jpeg INTERFACE ${libs_loc}/mozjpeg) target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg)
target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$<IF:$<CONFIG:Debug>,Debug,Release>/jpeg-static.lib) target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$<IF:$<CONFIG:Debug>,Debug,Release>/jpeg-static.lib)
elseif (APPLE AND NOT build_osx) elseif (APPLE AND NOT build_osx)
target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a) target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a)

2
external/kwayland/CMakeLists.txt vendored
View file

@ -19,7 +19,7 @@ else()
IMPORTED_LOCATION "${KWAYLAND_LIBRARY}" IMPORTED_LOCATION "${KWAYLAND_LIBRARY}"
) )
target_include_directories(external_kwayland target_include_directories(external_kwayland SYSTEM
INTERFACE INTERFACE
/usr/local/include/KF5 /usr/local/include/KF5
/usr/local/include/KF5/KWayland/Client /usr/local/include/KF5/KWayland/Client

2
external/openal/CMakeLists.txt vendored
View file

@ -10,7 +10,7 @@ add_library(desktop-app::external_openal ALIAS external_openal)
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
find_package(OpenAL) find_package(OpenAL)
if (OPENAL_FOUND) if (OPENAL_FOUND)
target_include_directories(external_openal INTERFACE ${OPENAL_INCLUDE_DIR}) target_include_directories(external_openal SYSTEM INTERFACE ${OPENAL_INCLUDE_DIR})
target_link_libraries(external_openal INTERFACE ${OPENAL_LIBRARY}) target_link_libraries(external_openal INTERFACE ${OPENAL_LIBRARY})
else() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)

8
external/opus/CMakeLists.txt vendored
View file

@ -17,7 +17,7 @@ else()
add_library(desktop-app::external_opus ALIAS external_opus) add_library(desktop-app::external_opus ALIAS external_opus)
if (WIN32) if (WIN32)
target_include_directories(external_opus target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
${libs_loc}/opus/include ${libs_loc}/opus/include
) )
@ -32,7 +32,7 @@ else()
IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib" IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib"
) )
elseif (APPLE AND NOT build_osx) elseif (APPLE AND NOT build_osx)
target_include_directories(external_opus target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include/opus /usr/local/macos/include/opus
) )
@ -40,7 +40,7 @@ else()
IMPORTED_LOCATION /usr/local/macos/lib/libopus.a IMPORTED_LOCATION /usr/local/macos/lib/libopus.a
) )
elseif (APPLE) elseif (APPLE)
target_include_directories(external_opus target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
/usr/local/include/opus /usr/local/include/opus
) )
@ -48,7 +48,7 @@ else()
IMPORTED_LOCATION /usr/local/lib/libopus.a IMPORTED_LOCATION /usr/local/lib/libopus.a
) )
else() else()
target_include_directories(external_opus target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
/usr/local/include/opus /usr/local/include/opus
) )

2
external/qr_code_generator/CMakeLists.txt vendored
View file

@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED)
find_path(QRCODE_INCLUDE_DIRS QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen) find_path(QRCODE_INCLUDE_DIRS QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen)
if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS) if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS)
target_include_directories(external_qr_code_generator 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})
endif() endif()
endif() endif()

6
external/qt/CMakeLists.txt vendored
View file

@ -18,7 +18,7 @@ if (DESKTOP_APP_USE_PACKAGED)
Qt5::Network Qt5::Network
) )
target_include_directories(external_qt target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${Qt5Core_PRIVATE_INCLUDE_DIRS} ${Qt5Core_PRIVATE_INCLUDE_DIRS}
${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
@ -31,7 +31,7 @@ if (DESKTOP_APP_USE_PACKAGED)
if (Qt5XkbCommonSupport_FOUND) if (Qt5XkbCommonSupport_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport) target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport)
target_include_directories(external_qt target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS} ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
) )
@ -40,7 +40,7 @@ if (DESKTOP_APP_USE_PACKAGED)
if (Qt5WaylandClient_FOUND) if (Qt5WaylandClient_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
target_include_directories(external_qt target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS}
) )

7
external/rlottie/CMakeLists.txt vendored
View file

@ -22,7 +22,12 @@ if (DESKTOP_APP_USE_PACKAGED)
endif() endif()
endif() endif()
if (NOT rlottie_FOUND AND NOT RLOTTIE_FOUND) if (rlottie_FOUND OR RLOTTIE_FOUND)
target_compile_definitions(external_rlottie
INTERFACE
DESKTOP_APP_USE_PACKAGED_RLOTTIE
)
else()
add_library(external_rlottie_bundled STATIC) add_library(external_rlottie_bundled STATIC)
init_target(external_rlottie_bundled "(external)") init_target(external_rlottie_bundled "(external)")

6
external/rnnoise/CMakeLists.txt vendored
View file

@ -18,7 +18,7 @@ else()
set(rnnoise_lib_loc ${libs_loc}/rnnoise/out) set(rnnoise_lib_loc ${libs_loc}/rnnoise/out)
if (WIN32) if (WIN32)
target_include_directories(external_rnnoise target_include_directories(external_rnnoise SYSTEM
INTERFACE INTERFACE
${libs_loc}/rnnoise/include ${libs_loc}/rnnoise/include
) )
@ -27,7 +27,7 @@ else()
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 target_include_directories(external_rnnoise SYSTEM
INTERFACE INTERFACE
${libs_loc}/rnnoise/include ${libs_loc}/rnnoise/include
) )
@ -36,7 +36,7 @@ else()
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 target_include_directories(external_rnnoise SYSTEM
INTERFACE INTERFACE
/usr/local/include /usr/local/include
) )

2
external/ton/CMakeLists.txt vendored
View file

@ -17,7 +17,7 @@ else()
set(ton_lib_suffix .a) set(ton_lib_suffix .a)
endif() endif()
target_include_directories(external_ton target_include_directories(external_ton SYSTEM
INTERFACE INTERFACE
${ton_loc} ${ton_loc}
${ton_loc}/crypto ${ton_loc}/crypto

4
external/webrtc/CMakeLists.txt vendored
View file

@ -59,7 +59,7 @@ else()
) )
endif() endif()
target_include_directories(external_webrtc target_include_directories(external_webrtc SYSTEM
INTERFACE INTERFACE
${webrtc_loc} ${webrtc_loc}
${webrtc_loc}/third_party/abseil-cpp ${webrtc_loc}/third_party/abseil-cpp
@ -70,7 +70,7 @@ else()
${webrtc_lib_prefix}tg_owt ${webrtc_lib_prefix}tg_owt
) )
if (APPLE) if (APPLE)
target_include_directories(external_webrtc 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

2
external/xxhash/CMakeLists.txt vendored
View file

@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED)
find_path(XXHASH_INCLUDE_DIRS xxhash.h) find_path(XXHASH_INCLUDE_DIRS xxhash.h)
if (XXHASH_LIBRARY AND XXHASH_INCLUDE_DIRS) if (XXHASH_LIBRARY AND XXHASH_INCLUDE_DIRS)
target_include_directories(external_xxhash INTERFACE ${XXHASH_INCLUDE_DIRS}) target_include_directories(external_xxhash SYSTEM INTERFACE ${XXHASH_INCLUDE_DIRS})
target_link_libraries(external_xxhash INTERFACE ${XXHASH_LIBRARY}) target_link_libraries(external_xxhash INTERFACE ${XXHASH_LIBRARY})
endif() endif()
endif() endif()

2
external/zlib/CMakeLists.txt vendored
View file

@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED)
target_link_libraries(external_zlib INTERFACE ZLIB::ZLIB) target_link_libraries(external_zlib INTERFACE ZLIB::ZLIB)
elseif (WIN32) elseif (WIN32)
target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI) target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI)
target_include_directories(external_zlib INTERFACE ${libs_loc}/zlib) target_include_directories(external_zlib SYSTEM INTERFACE ${libs_loc}/zlib)
if (build_win64) if (build_win64)
set(zlib_config_folder x64) set(zlib_config_folder x64)
else() else()

2
linux_gtk_helper/CMakeLists.txt
View file

@ -21,4 +21,4 @@ PUBLIC
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED gtk+-3.0) pkg_check_modules(GTK REQUIRED gtk+-3.0)
target_include_directories(linux_gtk_helper PRIVATE ${GTK_INCLUDE_DIRS}) target_include_directories(linux_gtk_helper SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})

14
options.cmake
View file

@ -63,6 +63,13 @@ if (DESKTOP_APP_USE_PACKAGED_LAZY)
) )
endif() endif()
if (DESKTOP_APP_DISABLE_WEBKITGTK)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_DISABLE_WEBKITGTK
)
endif()
if (DESKTOP_APP_USE_PACKAGED_FONTS) if (DESKTOP_APP_USE_PACKAGED_FONTS)
target_compile_definitions(common_options target_compile_definitions(common_options
INTERFACE INTERFACE
@ -70,13 +77,6 @@ if (DESKTOP_APP_USE_PACKAGED_FONTS)
) )
endif() endif()
if (rlottie_FOUND OR RLOTTIE_FOUND)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_USE_PACKAGED_RLOTTIE
)
endif()
if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
target_compile_definitions(common_options target_compile_definitions(common_options
INTERFACE INTERFACE

9
options_linux.cmake
View file

@ -11,25 +11,16 @@ INTERFACE
-pipe -pipe
-Wall -Wall
-W -W
-Wno-unused-variable
-Wno-unused-parameter -Wno-unused-parameter
-Wno-unused-function
-Wno-switch -Wno-switch
-Wno-comment
-Wno-missing-field-initializers -Wno-missing-field-initializers
-Wno-sign-compare -Wno-sign-compare
-Wno-attributes
-Wno-parentheses
$<$<NOT:$<COMPILE_LANGUAGE:C>>:-Wno-register>
) )
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(common_options target_compile_options(common_options
INTERFACE INTERFACE
-Wno-unused-but-set-variable
-Wno-stringop-overflow
-Wno-maybe-uninitialized -Wno-maybe-uninitialized
-Wno-error=class-memaccess
) )
endif() endif()

2
options_mac.cmake
View file

@ -15,7 +15,7 @@ else()
) )
endif() endif()
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
target_include_directories(common_options target_include_directories(common_options SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include /usr/local/macos/include
) )

1
variables.cmake
View file

@ -37,6 +37,7 @@ option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact pat
option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target}) option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
option(DESKTOP_APP_DISABLE_WEBKITGTK "Disable WebKitGTK library (Linux only)." OFF)
option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)