Revert "Заплатка для версий CMake < 3.8.0"
This reverts commit 0f5a90952b
.
This commit is contained in:
parent
0f5a90952b
commit
6748c65058
@ -36,15 +36,11 @@ 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")
|
|
||||||
check_enable_cxx_flag(-std=c++17)
|
|
||||||
else()
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
|
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
|
||||||
if(HAVE_FLAG_STD_GNUXX17)
|
if(HAVE_FLAG_STD_GNUXX17)
|
||||||
set(CMAKE_CXX_EXTENSIONS YES)
|
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)
|
||||||
if(HAVE_FLAG_STD_CXX14)
|
if(HAVE_FLAG_STD_CXX14)
|
||||||
|
Loading…
Reference in New Issue
Block a user