From a128fdcc283c9e66b2f211267e97c14b1a6f8e5a Mon Sep 17 00:00:00 2001 From: Ilya Fedin <fedin-ilja2010@ya.ru> Date: Mon, 5 Jun 2023 08:46:17 +0400 Subject: [PATCH] Always use Python3 cmake package instead of the Python one --- CMakeLists.txt | 2 +- Telegram/cmake/generate_scheme.cmake | 4 ++-- cmake | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c45a8132a..e456192cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ get_filename_component(submodules_loc "Telegram" REALPATH) get_filename_component(cmake_helpers_loc "cmake" REALPATH) if (NOT DESKTOP_APP_USE_PACKAGED AND WIN32) - set(Python_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/python/Scripts/python) + set(Python3_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/python/Scripts/python) endif() include(cmake/variables.cmake) diff --git a/Telegram/cmake/generate_scheme.cmake b/Telegram/cmake/generate_scheme.cmake index e5802742a..310e49d68 100644 --- a/Telegram/cmake/generate_scheme.cmake +++ b/Telegram/cmake/generate_scheme.cmake @@ -5,7 +5,7 @@ # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL function(generate_scheme target_name script scheme_files) - find_package(Python REQUIRED) + find_package(Python3 REQUIRED) set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen) file(MAKE_DIRECTORY ${gen_dst}) @@ -24,7 +24,7 @@ function(generate_scheme target_name script scheme_files) BYPRODUCTS ${gen_files} COMMAND - ${Python_EXECUTABLE} + ${Python3_EXECUTABLE} ${script} -o${gen_dst}/scheme ${scheme_files} diff --git a/cmake b/cmake index 02e600c6f..a41fa6e14 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 02e600c6f3af297c2e18af0ea5ee8320e5725554 +Subproject commit a41fa6e14006204f3fea7993a775e14f8fdde9fc