From bf4442ecf5f4a21636d39df3b88ca4e1c0d75ec8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 1 Jun 2025 02:41:51 +0400 Subject: [PATCH] CMAKE_CONFIG_TYPE doesn't seem to work This partially reverts commit ae451894368e5aba8e2fb999d0805da6900831be. --- .github/workflows/linux.yml | 2 +- Telegram/build/docker/centos_env/Dockerfile | 1 - Telegram/build/docker/centos_env/build.sh | 2 +- docs/building-linux.md | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5d7e0e60df..0421fe6b31 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -104,7 +104,7 @@ jobs: docker run --rm \ -u $(id -u) \ -v $PWD:/usr/src/tdesktop \ - -e CMAKE_CONFIG_TYPE=Debug \ + -e CONFIG=Debug \ $IMAGE_TAG \ /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \ -D CMAKE_CONFIGURATION_TYPES=Debug \ diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index ffffe3517a..03c13b03fb 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -44,7 +44,6 @@ ENV CXXFLAGS $CFLAGS ENV CMAKE_GENERATOR Ninja ENV CMAKE_BUILD_TYPE None -ENV CMAKE_CONFIG_TYPE Release ENV CMAKE_BUILD_PARALLEL_LEVEL '' FROM builder AS patches diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh index 6368e631b9..dfa475955f 100755 --- a/Telegram/build/docker/centos_env/build.sh +++ b/Telegram/build/docker/centos_env/build.sh @@ -3,4 +3,4 @@ set -e cd Telegram ./configure.sh "$@" -cmake --build ../out +cmake --build ../out --config "${CONFIG:-Release}" diff --git a/docs/building-linux.md b/docs/building-linux.md index 2f6d41e37a..fbdf253557 100644 --- a/docs/building-linux.md +++ b/docs/building-linux.md @@ -32,7 +32,7 @@ Or, to create a debug build, run (also using [your **api_id** and **api_hash**]( docker run --rm -it \ -u $(id -u) \ -v "$PWD:/usr/src/tdesktop" \ - -e CMAKE_CONFIG_TYPE=Debug \ + -e CONFIG=Debug \ tdesktop:centos_env \ /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \ -D TDESKTOP_API_ID=YOUR_API_ID \