[Cmake-commits] CMake branch, next, updated. v3.4.0-1558-g3a00e36
Brad King
brad.king at kitware.com
Tue Dec 1 09:07:47 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3a00e367994cde14d1a23a753b5e281e6342554a (commit)
via e10bfb77472f0a1706337e03d53f9c14c2347448 (commit)
from 67dbde412032c40fec53387ac32e7361b208166b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a00e367994cde14d1a23a753b5e281e6342554a
commit 3a00e367994cde14d1a23a753b5e281e6342554a
Merge: 67dbde4 e10bfb7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 1 09:07:47 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 1 09:07:47 2015 -0500
Merge topic 'intel-compiler-features' into next
e10bfb77 Revert "Features: Record standards and features for Intel C++ on UNIX"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e10bfb77472f0a1706337e03d53f9c14c2347448
commit e10bfb77472f0a1706337e03d53f9c14c2347448
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 1 09:07:30 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 1 09:07:30 2015 -0500
Revert "Features: Record standards and features for Intel C++ on UNIX"
This reverts commit 117d49b8b7671b7ad2901de444da725eda8ea8cc.
It will be revised.
diff --git a/Help/release/dev/intel-compiler-features.rst b/Help/release/dev/intel-compiler-features.rst
deleted file mode 100644
index f154dc9..0000000
--- a/Help/release/dev/intel-compiler-features.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-intel-compiler-features
------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
- is now aware of features supported by Intel C++ compilers versions 12.1
- through 16.0 on UNIX platforms.
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
deleted file mode 100644
index 95792b0..0000000
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-# References:
-# - https://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler
-# - https://software.intel.com/en-us/articles/c14-features-supported-by-intel-c-compiler
-
-# these are not implemented in any version at time of writing
-#set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}")
-#set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}")
-
-# unknown if this is implemented
-#set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel15_CXX14}")
-
-set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) || defined(__GXX_EXPERIMENTAL_CXX0X__))")
-set(DETECT_CXX14 "((__cplusplus >= 201103L) && !defined(__INTEL_CXX11_MODE__))")
-
-set(Intel16_CXX14 "__ICC >= 1600 && ${DETECT_CXX14}")
-set(_cmake_feature_test_cxx_contextual_conversions "${Intel16_CXX14}")
-set(_cmake_feature_test_cxx_generic_lambdas "${Intel16_CXX14}")
-set(_cmake_feature_test_cxx_digit_separators "${Intel16_CXX14}")
-# This test is supposed to work in Intel 14 but the compiler has a bug
-# in versions 14 and 15::
-# https://software.intel.com/en-us/forums/intel-c-compiler/topic/600514
-set(_cmake_feature_test_cxx_generalized_initializers "${Intel16_CXX14}")
-
-set(Intel15_CXX14 "__ICC >= 1500 && ${DETECT_CXX14}")
-set(_cmake_feature_test_cxx_decltype_auto "${Intel15_CXX14}")
-set(_cmake_feature_test_cxx_lambda_init_captures "${Intel15_CXX14}")
-set(_cmake_feature_test_cxx_attribute_deprecated "${Intel15_CXX14}")
-set(_cmake_feature_test_cxx_return_type_deduction "${Intel15_CXX14}")
-
-set(Intel15_CXX11 "__ICC >= 1500 && ${DETECT_CXX11}")
-set(_cmake_feature_test_cxx_alignas "${Intel15_CXX11}")
-set(_cmake_feature_test_cxx_alignof "${Intel15_CXX11}")
-set(_cmake_feature_test_cxx_inheriting_constructors "${Intel15_CXX11}")
-set(_cmake_feature_test_cxx_user_literals "${Intel15_CXX11}")
-set(_cmake_feature_test_cxx_thread_local "${Intel15_CXX11}")
-
-set(Intel14_CXX11 "${DETECT_CXX11} && (__ICC > 1400 || (__ICC == 1400 && __INTEL_COMPILER_UPDATE >= 2))")
-# Documented as 12.0+ but in testing it only works on 14.0.2+
-set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${Intel14_CXX11}")
-
-set(Intel14_CXX11 "__ICC >= 1400 && ${DETECT_CXX11}")
-set(_cmake_feature_test_cxx_delegating_constructors "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_constexpr "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_sizeof_member "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_strong_enums "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_reference_qualified_functions "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_raw_string_literals "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_unicode_literals "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_inline_namespaces "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_unrestricted_unions "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_nonstatic_member_init "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_enum_forward_declarations "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_override "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_final "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_noexcept "${Intel14_CXX11}")
-set(_cmake_feature_test_cxx_defaulted_move_initializers "${Intel14_CXX11}")
-
-set(Intel13_CXX11 "__ICC >= 1300 && ${DETECT_CXX11}")
-set(_cmake_feature_test_cxx_explicit_conversions "${Intel13_CXX11}")
-set(_cmake_feature_test_cxx_range_for "${Intel13_CXX11}")
-# Cannot find Intel documentation for N2640: cxx_uniform_initialization
-set(_cmake_feature_test_cxx_uniform_initialization "${Intel13_CXX11}")
-
-set(Intel121_CXX11 "__ICC >= 1210 && ${DETECT_CXX11}")
-set(_cmake_feature_test_cxx_variadic_templates "${Intel121_CXX11}")
-set(_cmake_feature_test_cxx_alias_templates "${Intel121_CXX11}")
-set(_cmake_feature_test_cxx_nullptr "${Intel121_CXX11}")
-set(_cmake_feature_test_cxx_trailing_return_types "${Intel121_CXX11}")
-set(_cmake_feature_test_cxx_attributes "${Intel121_CXX11}")
-set(_cmake_feature_test_cxx_default_function_template_args "${Intel121_CXX11}")
-
-set(Intel12_CXX11 "__ICC >= 1200 && ${DETECT_CXX11}")
-set(_cmake_feature_test_cxx_extended_friend_declarations "${Intel12_CXX11}")
-set(_cmake_feature_test_cxx_rvalue_references "${Intel12_CXX11}")
-set(_cmake_feature_test_cxx_decltype "${Intel12_CXX11}")
-set(_cmake_feature_test_cxx_defaulted_functions "${Intel12_CXX11}")
-set(_cmake_feature_test_cxx_deleted_functions "${Intel12_CXX11}")
-set(_cmake_feature_test_cxx_local_type_template_args "${Intel12_CXX11}")
-set(_cmake_feature_test_cxx_lambdas "${Intel12_CXX11}")
-
-set(_cmake_oldestSupported "__ICC >= 1110 && ${DETECT_CXX11}")
-set(_cmake_feature_test_cxx_binary_literals "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_static_assert "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_right_angle_brackets "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_auto_type "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_extern_templates "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_variadic_macros "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_long_long_type "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_func_identifier "${_cmake_oldestSupported}")
-set(_cmake_feature_test_cxx_template_template_parameters "${_cmake_oldestSupported}")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 65f3134..7947695 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -8,58 +8,5 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
- set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
- # todo: there is no gnu++14 value supported; figure out what to do
- set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++14")
-elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
- set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
- # todo: there is no gnu++14 value supported; figure out what to do
- set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++1y")
-endif()
-
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
- set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
- set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
- set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
-endif()
-
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
- set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++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}")
- else()
- set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
- endif()
- elseif (NOT CMAKE_CXX_STANDARD_COMPUTED_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(_get_intel_features std_version list)
- record_compiler_features(CXX "${std_version}" ${list})
- endmacro()
-
- set(_result 0)
- if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
- _get_intel_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
- endif()
- if (_result EQUAL 0)
- _get_intel_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
- endif()
- if (_result EQUAL 0)
- _get_intel_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
- endif()
- endif()
-endmacro()
-
set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index e6acee8..a32138d 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -119,55 +119,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
endif()
endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
- if (CMAKE_CXX_COMIPLER_VERSION VERSION_EQUAL 15.0)
- list(REMOVE_ITEM CXX_non_features
- # The cxx_contextual_conversions feature happens to work
- # (for *this* testcase) with Intel 13/14/15, but they do not
- # document support until 16.
- cxx_contextual_conversions
- )
-
- elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0)
- list(REMOVE_ITEM CXX_non_features
- cxx_alignof
-
- # not supposed to work until 15
- cxx_attribute_deprecated
-
- # The cxx_contextual_conversions feature happens to work
- # (for *this* testcase) with Intel 13/14/15, but they do not
- # document support until 16.
- cxx_contextual_conversions
- )
-
- elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- list(REMOVE_ITEM CXX_non_features
- # These features happen to work but aren't documented to
- # do so until 14.0
- cxx_constexpr
- cxx_enum_forward_declarations
- cxx_sizeof_member
- cxx_strong_enums
- cxx_unicode_literals
-
- # not supposed to work until 15
- cxx_attribute_deprecated
- cxx_nonstatic_member_init
-
- # The cxx_contextual_conversions feature happens to work
- # (for *this* testcase) with Intel 13/14/15, but they do not
- # document support until 16.
- cxx_contextual_conversions
-
- # This is an undocumented feature; it does not work in future versions
- cxx_aggregate_default_initializers
- )
- endif()
- endif()
-endif()
-
set(C_ext c)
set(C_standard_flag 11)
set(CXX_ext cpp)
@@ -350,29 +301,6 @@ if (CMAKE_CXX_COMPILE_FEATURES)
-DEXPECT_FINAL=1
-DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=1
)
- elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15)
- add_definitions(
- -DEXPECT_OVERRIDE_CONTROL=1
- -DEXPECT_INHERITING_CONSTRUCTORS=1
- -DEXPECT_FINAL=1
- -DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=1
- )
- elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
- add_definitions(
- -DEXPECT_OVERRIDE_CONTROL=1
- -DEXPECT_INHERITING_CONSTRUCTORS=0
- -DEXPECT_FINAL=1
- -DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=0
- )
- else()
- add_definitions(
- -DEXPECT_OVERRIDE_CONTROL=0
- -DEXPECT_INHERITING_CONSTRUCTORS=0
- -DEXPECT_FINAL=0
- -DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=0
- )
- endif()
endif()
add_executable(CompileFeaturesGenex genex_test.cpp)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/intel-compiler-features.rst | 6 --
Modules/Compiler/Intel-CXX-FeatureTests.cmake | 90 -------------------------
Modules/Compiler/Intel-CXX.cmake | 53 ---------------
Tests/CompileFeatures/CMakeLists.txt | 72 --------------------
4 files changed, 221 deletions(-)
delete mode 100644 Help/release/dev/intel-compiler-features.rst
delete mode 100644 Modules/Compiler/Intel-CXX-FeatureTests.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list