kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-C-standard-features' 

fb3487a9 Features: Fix C90 feature detection.
6027798a Features: Allow setting standard dialect below the default.
9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
72537e44 Features: Add dialect compile flags only if default is known.
82c9d686 AppleClang: Remove redundant UNIX condition.
This commit is contained in:
Brad King 2015-02-05 09:25:14 -05:00 committed by CMake Topic Stage
parent 0ae11b1fb0 fb3487a997
commit 9042c875dc
16 changed files with 200 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Compiler/AppleClang-C-FeatureTests.cmake
View File

@ -7,5 +7,5 @@ set(AppleClang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __
set(_cmake_feature_test_c_restrict "${AppleClang_C99}")
set(_cmake_feature_test_c_variadic_macros "${AppleClang_C99}")
set(AppleClang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
set(AppleClang_C90 "${_cmake_oldestSupported}")
set(_cmake_feature_test_c_function_prototypes "${AppleClang_C90}")

6
Modules/Compiler/AppleClang-C.cmake
View File

@ -12,7 +12,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
endif()
set(CMAKE_C_STANDARD_DEFAULT 99)
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_C_STANDARD_DEFAULT 99)
endif()
macro(cmake_record_c_compile_features)
macro(_get_appleclang_features std_version list)
@ -20,7 +22,7 @@ macro(cmake_record_c_compile_features)
endmacro()
set(_result 0)
if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
_get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
if (_result EQUAL 0)
_get_appleclang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)

6
Modules/Compiler/AppleClang-CXX.cmake
View File

@ -19,7 +19,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
set(CMAKE_CXX_STANDARD_DEFAULT 98)
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_CXX_STANDARD_DEFAULT 98)
endif()
macro(cmake_record_cxx_compile_features)
macro(_get_appleclang_features std_version list)
@ -27,7 +29,7 @@ macro(cmake_record_cxx_compile_features)
endmacro()
set(_result 0)
if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
set(_result 0)
if(CMAKE_CXX14_STANDARD_COMPILE_OPTION)
_get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)

2
Modules/Compiler/Clang-C-FeatureTests.cmake
View File

@ -7,5 +7,5 @@ set(Clang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_
set(_cmake_feature_test_c_restrict "${Clang_C99}")
set(_cmake_feature_test_c_variadic_macros "${Clang_C99}")
set(Clang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
set(Clang_C90 "${_cmake_oldestSupported}")
set(_cmake_feature_test_c_function_prototypes "${Clang_C90}")

4
Modules/Compiler/Clang-CXX.cmake
View File

@ -31,7 +31,9 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
set(CMAKE_CXX_STANDARD_DEFAULT 98)
if(UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
set(CMAKE_CXX_STANDARD_DEFAULT 98)
endif()
macro(cmake_record_cxx_compile_features)
macro(_get_clang_features std_version list)

2
Modules/Compiler/GNU-C-FeatureTests.cmake
View File

@ -13,5 +13,5 @@ set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSIO
set(_cmake_feature_test_c_restrict "${GNU44_C99}")
set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
set(GNU_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
set(GNU_C90 "${_cmake_oldestSupported}")
set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")

2
Modules/Compiler/GNU-C.cmake
View File

@ -24,7 +24,7 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
set(CMAKE_C_STANDARD_DEFAULT 11)
else()
elseif(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
set(CMAKE_C_STANDARD_DEFAULT 90)
endif()

4
Modules/Compiler/GNU-CXX.cmake
View File

@ -34,7 +34,9 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
set(CMAKE_CXX_STANDARD_DEFAULT 98)
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
set(CMAKE_CXX_STANDARD_DEFAULT 98)
endif()
macro(cmake_record_cxx_compile_features)
macro(_get_gcc_features std_version list)

7
Modules/Compiler/MSVC-CXX.cmake
View File

@ -1,5 +1,8 @@
# MSVC has no specific language level or flags to change it.
set(CMAKE_CXX_STANDARD_DEFAULT "")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
# MSVC has no specific language level or flags to change it.
set(CMAKE_CXX_STANDARD_DEFAULT "")
endif()
macro(cmake_record_cxx_compile_features)
record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)

4
Modules/Compiler/SunPro-CXX.cmake
View File

@ -37,7 +37,9 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
endif()
set(CMAKE_CXX_STANDARD_DEFAULT 98)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
set(CMAKE_CXX_STANDARD_DEFAULT 98)
endif()
macro(cmake_record_cxx_compile_features)
macro(_get_solaris_studio_features std_version list)

34
Source/cmLocalGenerator.cxx
View File

@ -2205,7 +2205,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
}
const char* defaultStd
= this->Makefile->GetDefinition("CMAKE_" + lang + "_STANDARD_DEFAULT");
if (defaultStd && !*defaultStd)
if (!defaultStd || !*defaultStd)
{
// This compiler has no notion of language standard levels.
return;
@ -2272,18 +2272,32 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
std::find(stds.begin(), stds.end(), standard);
assert(stdIt != stds.end());
std::vector<std::string>::const_iterator defaultStdIt;
if (defaultStd)
std::vector<std::string>::const_iterator defaultStdIt =
std::find(stds.begin(), stds.end(), defaultStd);
if (defaultStdIt == stds.end())
{
defaultStdIt = std::find(stds.begin(), stds.end(), defaultStd);
assert(defaultStdIt != stds.end());
}
else
{
defaultStdIt = stds.end() - 1;
std::string e =
"CMAKE_" + lang + "_STANDARD_DEFAULT is set to invalid value '" +
std::string(defaultStd) + "'";
this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, e);
return;
}
for ( ; stdIt <= defaultStdIt; ++stdIt)
// Greater or equal because the standards are stored in
// backward chronological order.
if (stdIt >= defaultStdIt)
{
std::string option_flag =
"CMAKE_" + lang + *stdIt
+ "_" + type + "_COMPILE_OPTION";
const char *opt =
target->GetMakefile()->GetRequiredDefinition(option_flag);
this->AppendFlagEscape(flags, opt);
return;
}
for ( ; stdIt < defaultStdIt; ++stdIt)
{
std::string option_flag =
"CMAKE_" + lang + *stdIt

32
Tests/CompileFeatures/CMakeLists.txt
View File

@ -164,6 +164,38 @@ if (CMAKE_C_COMPILE_FEATURES)
)
endif()
endif()
add_executable(CompileFeaturesGenex_C genex_test.c)
set_property(TARGET CompileFeaturesGenex_C PROPERTY C_STANDARD 11)
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
list(APPEND expected_defs
EXPECT_C_STATIC_ASSERT=1
)
else()
list(APPEND expected_defs
EXPECT_C_STATIC_ASSERT=0
)
endif()
elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang"
OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
list(APPEND expected_defs
EXPECT_C_STATIC_ASSERT=1
)
endif()
list(APPEND expected_defs
EXPECT_C_FUNCTION_PROTOTYPES=1
EXPECT_C_RESTRICT=1
)
target_compile_definitions(CompileFeaturesGenex_C PRIVATE
HAVE_C_FUNCTION_PROTOTYPES=$<COMPILE_FEATURES:c_function_prototypes>
HAVE_C_RESTRICT=$<COMPILE_FEATURES:c_restrict>
HAVE_C_STATIC_ASSERT=$<COMPILE_FEATURES:c_static_assert>
${expected_defs}
)
endif()
if (CMAKE_CXX_COMPILE_FEATURES)

38
Tests/CompileFeatures/genex_test.c Normal file
View File

@ -0,0 +1,38 @@
#ifndef EXPECT_C_STATIC_ASSERT
# error EXPECT_C_STATIC_ASSERT not defined
#endif
#ifndef EXPECT_C_FUNCTION_PROTOTYPES
# error EXPECT_C_FUNCTION_PROTOTYPES not defined
#endif
#ifndef EXPECT_C_RESTRICT
# error EXPECT_C_RESTRICT not defined
#endif
#if !EXPECT_C_STATIC_ASSERT
#if EXPECT_C_STATIC_ASSERT
#error "Expect c_static_assert feature"
#endif
#else
#if !EXPECT_C_STATIC_ASSERT
#error "Expect no c_static_assert feature"
#endif
#endif
#if !EXPECT_C_FUNCTION_PROTOTYPES
# error Expect c_function_prototypes support
#endif
#if !EXPECT_C_RESTRICT
# if EXPECT_C_RESTRICT
# error Expect c_restrict support
# endif
#else
# if !EXPECT_C_RESTRICT
# error Expect no c_restrict support
# endif
#endif
int main()
{
}

22
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
View File

@ -84,6 +84,15 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
add_executable(C_undefined c_undefined.c)
set_property(TARGET C_undefined PROPERTY C_STANDARD 90)
target_compile_options(C_undefined PRIVATE -Werror=undef)
add_executable(WriteCompilerDetectionHeader_C main.c)
set_property(TARGET WriteCompilerDetectionHeader_C PROPERTY C_STANDARD 90)
set_defines(WriteCompilerDetectionHeader_C "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES" "EXPECTED_COMPILER_C_RESTRICT")
add_executable(WriteCompilerDetectionHeader_C_multi main_multi.c)
set_property(TARGET WriteCompilerDetectionHeader_C_multi PROPERTY C_STANDARD 90)
set_defines(WriteCompilerDetectionHeader_C_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES" "EXPECTED_COMPILER_C_RESTRICT")
target_include_directories(WriteCompilerDetectionHeader_C_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
endif()
add_executable(WriteCompilerDetectionHeader main.cpp)
@ -130,3 +139,16 @@ add_executable(multi_files_11 multi_files.cpp)
set_property(TARGET multi_files_11 PROPERTY CXX_STANDARD 11)
target_include_directories(multi_files_11 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
set_defines(multi_files_11 "${true_defs}" "${false_defs}")
if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
add_executable(WriteCompilerDetectionHeader_C11 main.c)
set_property(TARGET WriteCompilerDetectionHeader_C11 PROPERTY C_STANDARD 11)
set_defines(WriteCompilerDetectionHeader_C11 "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
add_executable(WriteCompilerDetectionHeader_C11_multi main_multi.c)
set_property(TARGET WriteCompilerDetectionHeader_C11_multi PROPERTY C_STANDARD 11)
set_defines(WriteCompilerDetectionHeader_C11_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
target_include_directories(WriteCompilerDetectionHeader_C11_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
endif()

29
Tests/Module/WriteCompilerDetectionHeader/main.c Normal file
View File

@ -0,0 +1,29 @@
#include "test_compiler_detection.h"
#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || !TEST_COMPILER_C_FUNCTION_PROTOTYPES
# error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES
#endif
#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
# error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
#endif
#if !defined(TEST_COMPILER_C_RESTRICT) || !TEST_COMPILER_C_RESTRICT
# if EXPECTED_COMPILER_C_RESTRICT
# error Expected TEST_COMPILER_C_RESTRICT
# endif
#else
# if !EXPECTED_COMPILER_C_RESTRICT
# error Expect no TEST_COMPILER_C_RESTRICT
# endif
#endif
#ifdef TEST_COMPILER_CXX_STATIC_ASSERT
#error Expect no CXX features defined
#endif
int main()
{
return 0;
}

29
Tests/Module/WriteCompilerDetectionHeader/main_multi.c Normal file
View File

@ -0,0 +1,29 @@
#include "multi_file_compiler_detection.h"
#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || !MULTI_COMPILER_C_FUNCTION_PROTOTYPES
# error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES
#endif
#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
# error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
#endif
#if !defined(MULTI_COMPILER_C_RESTRICT) || !MULTI_COMPILER_C_RESTRICT
# if EXPECTED_COMPILER_C_RESTRICT
# error Expected MULTI_COMPILER_C_RESTRICT
# endif
#else
# if !EXPECTED_COMPILER_C_RESTRICT
# error Expect no MULTI_COMPILER_C_RESTRICT
# endif
#endif
#ifdef MULTI_COMPILER_CXX_STATIC_ASSERT
#error Expect no CXX features defined
#endif
int main()
{
return 0;
}