Commit 31c6b9ad authored by Brad King's avatar Brad King

Generalize check for C++14 constructs

The check for C++14 and cstdio is a special case of the more general
problem of checking that the compiler's C++14 mode supports everything
we need.  Rename the checks accordingly.
parent 05af537e
......@@ -64,8 +64,8 @@ if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.14)
set(CMAKE_CXX_STANDARD 98)
else()
include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_cstdio.cmake)
if(NOT CMake_CXX14_CSTDIO_BROKEN)
include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_check.cmake)
if(NOT CMake_CXX14_BROKEN)
set(CMAKE_CXX_STANDARD 14)
else()
set(CMAKE_CXX_STANDARD 11)
......
set(CMake_CXX14_CSTDIO_BROKEN 0)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND CMAKE_CXX14_STANDARD_COMPILE_OPTION)
if(NOT DEFINED CMake_CXX14_CSTDIO_WORKS)
message(STATUS "Checking if compiler supports C++14 cstdio")
try_compile(CMake_CXX14_CSTDIO_WORKS
set(CMake_CXX14_BROKEN 0)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
if(NOT CMAKE_CXX14_STANDARD_COMPILE_OPTION)
set(CMake_CXX14_WORKS 0)
endif()
if(NOT DEFINED CMake_CXX14_WORKS)
message(STATUS "Checking if compiler supports needed C++14 constructs")
try_compile(CMake_CXX14_WORKS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_LIST_DIR}/cm_cxx14_cstdio.cpp
${CMAKE_CURRENT_LIST_DIR}/cm_cxx14_check.cpp
CMAKE_FLAGS -DCMAKE_CXX_STANDARD=14
OUTPUT_VARIABLE OUTPUT
)
if(CMake_CXX14_CSTDIO_WORKS AND "${OUTPUT}" MATCHES "error: no member named.*gets.*in the global namespace")
set_property(CACHE CMake_CXX14_CSTDIO_WORKS PROPERTY VALUE 0)
if(CMake_CXX14_WORKS AND "${OUTPUT}" MATCHES "error: no member named.*gets.*in the global namespace")
set_property(CACHE CMake_CXX14_WORKS PROPERTY VALUE 0)
endif()
if(CMake_CXX14_CSTDIO_WORKS)
message(STATUS "Checking if compiler supports C++14 cstdio - yes")
if(CMake_CXX14_WORKS)
message(STATUS "Checking if compiler supports needed C++14 constructs - yes")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if compiler supports C++14 cstdio passed with the following output:\n"
"Determining if compiler supports needed C++14 constructs passed with the following output:\n"
"${OUTPUT}\n"
"\n"
)
else()
message(STATUS "Checking if compiler supports C++14 cstdio - no")
message(STATUS "Checking if compiler supports needed C++14 constructs - no")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if compiler supports C++14 cstdio failed with the following output:\n"
"Determining if compiler supports needed C++14 constructs failed with the following output:\n"
"${OUTPUT}\n"
"\n"
)
endif()
endif()
if(NOT CMake_CXX14_CSTDIO_WORKS)
set(CMake_CXX14_CSTDIO_BROKEN 1)
if(NOT CMake_CXX14_WORKS)
set(CMake_CXX14_BROKEN 1)
endif()
endif()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment