Include variables.cmake after project() call.

Fixes telegramdesktop#6950.
AlirezaHedayatfar · Jan 17, 2020 · 1f447f9 · 1f447f9
1 parent 208b5d7
commit 1f447f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)

diff --git a/Telegram/configure.py b/Telegram/configure.py
@@ -52,8 +52,7 @@ def error(message):
             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:

diff --git a/cmake b/cmake
+2 −0		external/zlib/CMakeLists.txt
+37 −0		validate_special_target.cmake
+2 −19		variables.cmake