diff options
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx14_check.cmake | 36 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx14_check.cpp (renamed from Source/Checks/cm_cxx14_cstdio.cpp) | 0 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx14_cstdio.cmake | 33 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx17_check.cmake | 36 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx17_check.cpp | 7 | ||||
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 3 |
7 files changed, 93 insertions, 39 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ebeca22..e4d2a9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,11 +64,20 @@ 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) - set(CMAKE_CXX_STANDARD 14) + if(NOT CMAKE_VERSION VERSION_LESS 3.8) + include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx17_check.cmake) else() - set(CMAKE_CXX_STANDARD 11) + set(CMake_CXX17_BROKEN 1) + endif() + if(NOT CMake_CXX17_BROKEN) + set(CMAKE_CXX_STANDARD 17) + else() + 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) + endif() endif() endif() endif() diff --git a/Source/Checks/cm_cxx14_check.cmake b/Source/Checks/cm_cxx14_check.cmake new file mode 100644 index 0000000..a78ba35 --- /dev/null +++ b/Source/Checks/cm_cxx14_check.cmake @@ -0,0 +1,36 @@ +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_check.cpp + CMAKE_FLAGS -DCMAKE_CXX_STANDARD=14 + OUTPUT_VARIABLE OUTPUT + ) + 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_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 needed C++14 constructs passed with the following output:\n" + "${OUTPUT}\n" + "\n" + ) + else() + 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 needed C++14 constructs failed with the following output:\n" + "${OUTPUT}\n" + "\n" + ) + endif() + endif() + if(NOT CMake_CXX14_WORKS) + set(CMake_CXX14_BROKEN 1) + endif() +endif() diff --git a/Source/Checks/cm_cxx14_cstdio.cpp b/Source/Checks/cm_cxx14_check.cpp index f5806a9..f5806a9 100644 --- a/Source/Checks/cm_cxx14_cstdio.cpp +++ b/Source/Checks/cm_cxx14_check.cpp diff --git a/Source/Checks/cm_cxx14_cstdio.cmake b/Source/Checks/cm_cxx14_cstdio.cmake deleted file mode 100644 index 73f7e2e..0000000 --- a/Source/Checks/cm_cxx14_cstdio.cmake +++ /dev/null @@ -1,33 +0,0 @@ -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 - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_LIST_DIR}/cm_cxx14_cstdio.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) - endif() - if(CMake_CXX14_CSTDIO_WORKS) - message(STATUS "Checking if compiler supports C++14 cstdio - yes") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining if compiler supports C++14 cstdio passed with the following output:\n" - "${OUTPUT}\n" - "\n" - ) - else() - message(STATUS "Checking if compiler supports C++14 cstdio - no") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if compiler supports C++14 cstdio failed with the following output:\n" - "${OUTPUT}\n" - "\n" - ) - endif() - endif() - if(NOT CMake_CXX14_CSTDIO_WORKS) - set(CMake_CXX14_CSTDIO_BROKEN 1) - endif() -endif() diff --git a/Source/Checks/cm_cxx17_check.cmake b/Source/Checks/cm_cxx17_check.cmake new file mode 100644 index 0000000..83d3971 --- /dev/null +++ b/Source/Checks/cm_cxx17_check.cmake @@ -0,0 +1,36 @@ +set(CMake_CXX17_BROKEN 0) +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + if(NOT CMAKE_CXX17_STANDARD_COMPILE_OPTION) + set(CMake_CXX17_WORKS 0) + endif() + if(NOT DEFINED CMake_CXX17_WORKS) + message(STATUS "Checking if compiler supports needed C++17 constructs") + try_compile(CMake_CXX17_WORKS + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_LIST_DIR}/cm_cxx17_check.cpp + CMAKE_FLAGS -DCMAKE_CXX_STANDARD=17 + OUTPUT_VARIABLE OUTPUT + ) + if(CMake_CXX17_WORKS AND "${OUTPUT}" MATCHES "error: no member named.*gets.*in the global namespace") + set_property(CACHE CMake_CXX17_WORKS PROPERTY VALUE 0) + endif() + if(CMake_CXX17_WORKS) + message(STATUS "Checking if compiler supports needed C++17 constructs - yes") + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if compiler supports needed C++17 constructs passed with the following output:\n" + "${OUTPUT}\n" + "\n" + ) + else() + message(STATUS "Checking if compiler supports needed C++17 constructs - no") + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if compiler supports needed C++17 constructs failed with the following output:\n" + "${OUTPUT}\n" + "\n" + ) + endif() + endif() + if(NOT CMake_CXX17_WORKS) + set(CMake_CXX17_BROKEN 1) + endif() +endif() diff --git a/Source/Checks/cm_cxx17_check.cpp b/Source/Checks/cm_cxx17_check.cpp new file mode 100644 index 0000000..2cbf1d5 --- /dev/null +++ b/Source/Checks/cm_cxx17_check.cpp @@ -0,0 +1,7 @@ +#include <cstdio> +#include <unordered_map> + +int main() +{ + return 0; +} diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index d5531cb..4f546bb 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -8,7 +8,6 @@ #include "cmsys/FStream.hxx" #include <algorithm> #include <ctype.h> -#include <functional> #include <iterator> #include <memory> // IWYU pragma: keep #include <sstream> @@ -114,7 +113,7 @@ std::string cmGlobalNinjaGenerator::EncodeIdent(const std::string& ident, std::ostream& vars) { if (std::find_if(ident.begin(), ident.end(), - std::not1(std::ptr_fun(IsIdentChar))) != ident.end()) { + [](char c) { return !IsIdentChar(c); }) != ident.end()) { static unsigned VarNum = 0; std::ostringstream names; names << "ident" << VarNum++; |