RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Include variables.cmake after project() call. 

Fixes #6950.
This commit is contained in:
John Preston 2020-01-17 11:29:10 +03:00
parent 208b5d7b5b
commit 1f447f98d8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -10,7 +10,7 @@ cmake_policy(SET CMP0091 NEW)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
include(cmake/variables.cmake)
include(cmake/validate_special_target.cmake)
include(cmake/version.cmake)
desktop_app_parse_version(Telegram/build/version)
@ -22,6 +22,7 @@ project(Telegram
)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
include(cmake/variables.cmake)
include(cmake/nice_target_sources.cmake)
include(cmake/target_link_static_libraries.cmake)
include(cmake/target_link_frameworks.cmake)

3
Telegram/configure.py
View File

@ -52,8 +52,7 @@ if officialTarget != '':
elif apiHashMatch:
arguments.append('-DTDESKTOP_API_HASH=' + apiHashMatch.group(1))
finish(run_cmake.run(scriptName, arguments))
if 'linux' in sys.platform:
elif 'linux' in sys.platform:
debugCode = run_cmake.run(scriptName, arguments, "Debug")
finish(debugCode if debugCode else run_cmake.run(scriptName, arguments, "Release"))
else:

2
cmake

@ -1 +1 @@
Subproject commit b087501d66ea13395acd91397b3ab6a3a77c41b8
Subproject commit 7081bc283b988361ae8be2c37e09e0d97c40b7db