procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Stanislav Ershov 2018-03-12 13:50:15 +03:00 committed by Alex
parent 19e8c86e4b
commit bf0dc8e64e
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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/")

8
Telegram/CMakeLists.txt
View File

@ -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