mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

AppleClang: Use common compiler macros for language standard default

Browse Source
This commit is contained in:
Chuck Atkins
2017-05-01 13:21:31 -04:00
parent 174c02e149
commit d908987634
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Compiler/AppleClang-C.cmake
+1 -11
View File
@@ -12,17 +12,7 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11") set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
endif() endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0) __compiler_check_default_language_standard(C 4.0 99)
if (NOT CMAKE_C_COMPILER_FORCED)
if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}")
endif()
set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT)
# Compiler id was forced so just guess the default standard level.
set(CMAKE_C_STANDARD_DEFAULT 99)
endif()
endif()
macro(cmake_record_c_compile_features) macro(cmake_record_c_compile_features)
set(_result 0) set(_result 0)
Modules/Compiler/AppleClang-CXX.cmake
+1 -12
View File
@@ -27,18 +27,7 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z") set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
endif() endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) __compiler_check_default_language_standard(CXX 4.0 98)
if (NOT CMAKE_CXX_COMPILER_FORCED)
if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}")
endif()
set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
elseif(NOT DEFINED CMAKE_CXX_STANDARD_DEFAULT)
# Compiler id was forced so just guess the default standard level.
set(CMAKE_CXX_STANDARD_DEFAULT 98)
endif()
endif()
macro(cmake_record_cxx_compile_features) macro(cmake_record_cxx_compile_features)
set(_result 0) set(_result 0)