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

Revert "Заплатка для версий CMake < 3.8.0"

Browse Source 
This reverts commit 0f5a90952b.
This commit is contained in:
Andrei Astafev
2020-12-23 11:03:41 +03:00
parent 0f5a90952b
commit 6748c65058
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMLibCompilerFlags.cmake
View File

@@ -36,14 +36,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED YES)
check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17)
if(HAVE_FLAG_STD_CXX17) if(HAVE_FLAG_STD_CXX17)
if(${CMAKE_VERSION} VERSION_LESS "3.8.0") set(CMAKE_CXX_STANDARD 17)
check_enable_cxx_flag(-std=c++17) check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
else() if(HAVE_FLAG_STD_GNUXX17)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_EXTENSIONS YES)
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
if(HAVE_FLAG_STD_GNUXX17)
set(CMAKE_CXX_EXTENSIONS YES)
endif()
endif() endif()
else() else()
check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14) check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14)