pool/cmake
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6982a704d6
cmake/c17-default.patch

76 lines
3.1 KiB
Diff
Raw Normal View History

Accepting request 576303 from home:Andreas_Schwab:gcc8 - c17-default.patch: Add support for C17 default in GCC 8 OBS-URL: https://build.opensuse.org/request/show/576303 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=314
2018-02-14 09:22:50 +01:00
Index: cmake-3.10.2/Modules/CMakeCCompilerId.c.in
===================================================================
--- cmake-3.10.2.orig/Modules/CMakeCCompilerId.c.in
+++ cmake-3.10.2/Modules/CMakeCCompilerId.c.in
@@ -39,6 +39,8 @@ char const *info_cray = "INFO" ":" "comp
# else
# define C_DIALECT
# endif
+#elif __STDC_VERSION__ >= 201710L
+# define C_DIALECT "17"
#elif __STDC_VERSION__ >= 201000L
# define C_DIALECT "11"
#elif __STDC_VERSION__ >= 199901L
Index: cmake-3.10.2/Modules/Compiler/GNU-C.cmake
===================================================================
--- cmake-3.10.2.orig/Modules/Compiler/GNU-C.cmake
+++ cmake-3.10.2/Modules/Compiler/GNU-C.cmake
@@ -22,4 +22,4 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VER
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
endif()
-__compiler_check_default_language_standard(C 3.4 90 5.0 11)
+__compiler_check_default_language_standard(C 3.4 90 5.0 11 8.0 17)
Index: cmake-3.10.2/Source/cmLocalGenerator.cxx
===================================================================
--- cmake-3.10.2.orig/Source/cmLocalGenerator.cxx
+++ cmake-3.10.2/Source/cmLocalGenerator.cxx
@@ -1575,6 +1575,7 @@ void cmLocalGenerator::AddCompilerRequir
langStdMap["CXX"].push_back("11");
langStdMap["CXX"].push_back("98");
+ langStdMap["C"].push_back("17");
langStdMap["C"].push_back("11");
langStdMap["C"].push_back("99");
langStdMap["C"].push_back("90");
Index: cmake-3.10.2/Source/cmMakefile.cxx
===================================================================
--- cmake-3.10.2.orig/Source/cmMakefile.cxx
+++ cmake-3.10.2/Source/cmMakefile.cxx
@@ -4077,7 +4077,7 @@ static const char* const CXX_FEATURES[]
FEATURE_STRING) };
#undef FEATURE_STRING
-static const char* const C_STANDARDS[] = { "90", "99", "11" };
+static const char* const C_STANDARDS[] = { "90", "99", "11", "17" };
static const char* const CXX_STANDARDS[] = { "98", "11", "14", "17" };
bool cmMakefile::AddRequiredTargetFeature(cmTarget* target,
Index: cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt
===================================================================
--- cmake-3.10.2.orig/Tests/CompileFeatures/CMakeLists.txt
+++ cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt
@@ -214,6 +214,7 @@ if (C_expected_features)
if (std_flag_idx EQUAL -1)
add_executable(default_dialect_C default_dialect.c)
target_compile_definitions(default_dialect_C PRIVATE
+ DEFAULT_C17=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},17>
DEFAULT_C11=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},11>
DEFAULT_C99=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},99>
DEFAULT_C90=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},90>
Index: cmake-3.10.2/Tests/CompileFeatures/default_dialect.c
===================================================================
--- cmake-3.10.2.orig/Tests/CompileFeatures/default_dialect.c
+++ cmake-3.10.2/Tests/CompileFeatures/default_dialect.c
@@ -1,5 +1,9 @@
-#if DEFAULT_C11
+#if DEFAULT_C17
Accepting request 592384 from home:mathletic:branches:devel:tools:building - Updateo to 3.11.0 * No changes specific to CMake-GUI - Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream - Updated to 3.11.0 * The Makefile Generators and the Ninja generator learned to add compiler launcher tools * The COMPILE_DEFINITIONS source file property learned to support generator expressions. * COMPILE_OPTIONS source file property was added to manage list of options to pass to the compiler. * A new FetchContent module was added which supports populating content at configure time using any of the download/update methods supported by ExternalProject_Add(). full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html - Adapted form.patch and c17-default.patch OBS-URL: https://build.opensuse.org/request/show/592384 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=318
2018-03-30 11:52:24 +02:00
+#if __STDC_VERSION__ < 201710L
Accepting request 576303 from home:Andreas_Schwab:gcc8 - c17-default.patch: Add support for C17 default in GCC 8 OBS-URL: https://build.opensuse.org/request/show/576303 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=314
2018-02-14 09:22:50 +01:00
+#error Unexpected value for __STDC_VERSION__.
+#endif
+#elif DEFAULT_C11
Accepting request 592384 from home:mathletic:branches:devel:tools:building - Updateo to 3.11.0 * No changes specific to CMake-GUI - Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream - Updated to 3.11.0 * The Makefile Generators and the Ninja generator learned to add compiler launcher tools * The COMPILE_DEFINITIONS source file property learned to support generator expressions. * COMPILE_OPTIONS source file property was added to manage list of options to pass to the compiler. * A new FetchContent module was added which supports populating content at configure time using any of the download/update methods supported by ExternalProject_Add(). full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html - Adapted form.patch and c17-default.patch OBS-URL: https://build.opensuse.org/request/show/592384 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=318
2018-03-30 11:52:24 +02:00
#if __STDC_VERSION__ < 201112L
Accepting request 576303 from home:Andreas_Schwab:gcc8 - c17-default.patch: Add support for C17 default in GCC 8 OBS-URL: https://build.opensuse.org/request/show/576303 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=314
2018-02-14 09:22:50 +01:00
#error Unexpected value for __STDC_VERSION__.
#endif
Reference in New Issue Copy Permalink