f1x1t/cmlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Проверка доступности стандарта C++17"

Browse Source 
This reverts commit a0cc72077c11defd55d44228e48f9e560577323d.
This commit is contained in:
Andrei Astafev 2020-12-23 11:03:49 +03:00
parent 6748c65058
commit b725122c89
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMLibCompilerFlags.cmake
View File

@ -34,25 +34,16 @@ endif()
# Выбор стандарта по умолчанию (можно переопределить в проекте) # Выбор стандарта по умолчанию (можно переопределить в проекте)
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14)
if(HAVE_FLAG_STD_CXX17) if(HAVE_FLAG_STD_CXX14)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 14)
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17) check_cxx_compiler_flag(-std=gnu++14 HAVE_FLAG_STD_GNUXX14)
if(HAVE_FLAG_STD_GNUXX17) if(HAVE_FLAG_STD_GNUXX14)
set(CMAKE_CXX_EXTENSIONS YES) set(CMAKE_CXX_EXTENSIONS YES)
endif() endif()
else() else()
check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14) set(CMAKE_CXX_STANDARD 11)
if(HAVE_FLAG_STD_CXX14) set(CMAKE_CXX_EXTENSIONS YES)
set(CMAKE_CXX_STANDARD 14)
check_cxx_compiler_flag(-std=gnu++14 HAVE_FLAG_STD_GNUXX14)
if(HAVE_FLAG_STD_GNUXX14)
set(CMAKE_CXX_EXTENSIONS YES)
endif()
else()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS YES)
endif()
endif() endif()
# Common configuration for GCC, clang and Intel. # Common configuration for GCC, clang and Intel.