fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-20 08:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore cmake 3.25 as minimum version

Browse Source
This commit is contained in:
Ilya Fedin
2026-06-30 12:29:16 +00:00
committed by John Preston
parent 6fcd650b35
commit a2d3b37a9e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -4,7 +4,7 @@
# For license and copyright information please follow this link: # For license and copyright information please follow this link:
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
cmake_minimum_required(VERSION 3.31) cmake_minimum_required(VERSION 3.25...3.31)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)

4
Telegram/build/docker/centos_env/Dockerfile
View File

@@ -13,7 +13,7 @@ ENV PKG_CONFIG_PATH=/opt/rh/$TOOLSET/root/usr/lib64/pkgconfig:/opt/rh/$TOOLSET/r
RUN --mount=type=cache,target=/var/cache/dnf <<EOF RUN --mount=type=cache,target=/var/cache/dnf <<EOF
dnf -y install epel-release dnf -y install epel-release
dnf config-manager --set-enabled powertools dnf config-manager --set-enabled powertools
dnf -y install autoconf automake libtool pkgconfig make patch git \ dnf -y install cmake autoconf automake libtool pkgconfig make patch git \
python3.11-pip python3.11-devel gperf flex bison clang-tools-extra \ python3.11-pip python3.11-devel gperf flex bison clang-tools-extra \
lld ccache nasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \ lld ccache nasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \
xorg-x11-util-macros $TOOLSET-gcc $TOOLSET-gcc-c++ $TOOLSET-binutils \ xorg-x11-util-macros $TOOLSET-gcc $TOOLSET-gcc-c++ $TOOLSET-binutils \
@@ -27,7 +27,7 @@ EOF
RUN <<EOF RUN <<EOF
alternatives --set python3 /usr/bin/python3.11 alternatives --set python3 /usr/bin/python3.11
python3 -m pip install cmake meson ninja python3 -m pip install meson ninja
EOF EOF
RUN <<EOF RUN <<EOF

2
snap/snapcraft.yaml
View File

@@ -39,8 +39,6 @@ parts:
parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml] parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
build-environment: build-environment:
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,--push-state,--no-as-needed,-ldav1d,--pop-state -s - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,--push-state,--no-as-needed,-ldav1d,--pop-state -s
build-snaps:
- cmake
build-packages: build-packages:
- libboost-regex-dev - libboost-regex-dev
- libheif-dev - libheif-dev