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

Compare commits

base: f1x1t:0f5a90952b28a74204a3de81ff4a7ab8caf7845f
Branches Tags
f1x1t:master
...
compare: f1x1t:b725122c891e57689233174a5d2904610c1339d2
Branches Tags
f1x1t:master

2 Commits
0f5a90952b ... b725122c89

Author SHA1 Message Date
Andrey Astafyev
b725122c89 Revert "Проверка доступности стандарта C++17" 
This reverts commit a0cc72077c.
 2020-12-23 11:03:49 +03:00
Andrey Astafyev
6748c65058 Revert "Заплатка для версий CMake < 3.8.0" 
This reverts commit 0f5a90952b.
 2020-12-23 11:03:41 +03:00
1 changed files with 8 additions and 21 deletions
Expand all files Collapse all files

13
CMLibCompilerFlags.cmake
View File

@@ -34,18 +34,6 @@ endif()
# Выбор стандарта по умолчанию (можно переопределить в проекте) # Выбор стандарта по умолчанию (можно переопределить в проекте)
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17)
if(HAVE_FLAG_STD_CXX17)
if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
check_enable_cxx_flag(-std=c++17)
else()
set(CMAKE_CXX_STANDARD 17)
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
if(HAVE_FLAG_STD_GNUXX17)
set(CMAKE_CXX_EXTENSIONS YES)
endif()
endif()
else()
check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14) check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14)
if(HAVE_FLAG_STD_CXX14) if(HAVE_FLAG_STD_CXX14)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
@@ -57,7 +45,6 @@ else()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS YES) set(CMAKE_CXX_EXTENSIONS YES)
endif() endif()
endif()
# Common configuration for GCC, clang and Intel. # Common configuration for GCC, clang and Intel.
if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_GCC) if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_GCC)