From bf0dc8e64e7277ae29195cff61f04b825aeab49d Mon Sep 17 00:00:00 2001
From: Stanislav Ershov <digital.stream.of.mind@gmail.com>
Date: Mon, 12 Mar 2018 13:50:15 +0300
Subject: [PATCH] Fix warning against overriding '/std:c++latest' with
 '/std:c++17'

This warning is fixed via updating to CMake 3.10
that learnt to set /std:c++17 for MSVS2017.
---
 CMakeLists.txt          | 2 +-
 Telegram/CMakeLists.txt | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cb05a461..2cee30a28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.10)
 project(telegram-desktop)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cotire/CMake;${PROJECT_SOURCE_DIR}/modules/")
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 7afbd668b..65c56b647 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -641,14 +641,6 @@ if(NOT WIN32)
     set_flag_if_supported(Telegram WNCE -Wno-c++1z-extensions)
 endif()
 
-# Enable C++17 support for msvc (@todo this should be done in cmake - see ver 3.10 or above)
-if(WIN32)
-    target_compile_options(Telegram PRIVATE
-        /std:c++latest
-        /EHsc   # Catch C++ exceptions only, extern C functions never throw a C++ exception.
-    )
-endif()
-
 target_compile_definitions(Telegram PRIVATE ${FFMPEG_DEFINITIONS})
 
 target_link_libraries(Telegram