Import Geant4 10.6.0 source tree

cmake/Modules/IntelCompileFeatures.cmake

@@ -1,115 +1,30 @@
-# - Rough n'Ready setup of CXX compile features for Intel
+# - CXX compile features for Intel to support C++14/17 on CMake from 3.8
 #
 #-----------------------------------------------------------------------
 # Add compile features for Intel - should eventually be placed
 # into a module, as it will need exporting for use by clients
 if(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-  # Now version selection, focus on version 15 and above as that is the
-  # baseline - means that this isn't comprehensive for lower versions
+  # CMake 3.8,3.9,3.10 support up to 16.0, c++14
+  #       3.11,3,12,3.13,3.14,3.15,3.16 support up to 18, c++17
+  # So need to provide addons to provide c++17 on 3.8-3.10
+  if(CMAKE_VERSION VERSION_LESS 3.11)
+    if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+      if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0)
+        set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-Qstd=c++17")
+        set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd=c++17")
 
-  # c++98 should be supported for all(?) versions we may encounter, and
-  # make it the default as required for compilers that recognise standards
-  set(CMAKE_CXX_STANDARD_DEFAULT "98")
-
-  set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
-  set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
-
-  if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0))
-    set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
-    set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-
-    # 15 and higher also allow c++14...
-    set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
-    set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
-  endif()
-
-  # Now the compile features... Eventually want to do these in the same
-  # way as CMake does (using compile time checks on compiler version
-  # etc - may also allow checks on GCC version in use), but for now
-  # *assume* that the underlying library will support.
-  if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0))
-    set(CMAKE_CXX14_COMPILE_FEATURES
-      cxx_contextual_conversions
-      cxx_generic_lambdas
-      cxx_aggregate_default_initializers
-      cxx_attribute_deprecated
-      cxx_digit_separators
-      )
-  endif()
-
-  if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0))
-    set(CMAKE_CXX14_COMPILE_FEATURES
-      ${CMAKE_CXX14_COMPILE_FEATURES}
-      cxx_binary_literals
-      cxx_decltype_auto #cxx_return_type_deduction?
-      cxx_lambda_init_captures
-      )
-    if(NOT WIN32)
-      list(APPEND CMAKE_CXX14_COMPILE_FEATURES cxx_attribute_deprecated)
-    endif()
-
-    set(CMAKE_CXX11_COMPILE_FEATURES
-      cxx_alias_templates
-      cxx_alignas
-      cxx_alignof
-      cxx_attributes
-      cxx_auto_type
-      cxx_constexpr
-      cxx_decltype_incomplete_return_types
-      cxx_decltype
-      cxx_default_function_template_args
-      cxx_defaulted_functions
-      cxx_defaulted_move_initializers
-      cxx_delegating_constructors
-      cxx_deleted_functions
-      cxx_enum_forward_declarations
-      cxx_explicit_conversions
-      cxx_extended_friend_declarations
-      cxx_extern_templates
-      cxx_final
-      cxx_func_identifier
-      cxx_generalized_initializers
-      cxx_inheriting_constructors
-      cxx_inline_namespaces
-      cxx_lambdas
-      cxx_local_type_template_args
-      cxx_long_long_type
-      cxx_noexcept
-      cxx_nonstatic_member_init
-      cxx_nullptr
-      cxx_override
-      cxx_range_for
-      cxx_raw_string_literals
-      cxx_reference_qualified_functions
-      cxx_right_angle_brackets
-      cxx_rvalue_references
-      cxx_sizeof_member
-      cxx_static_assert
-      cxx_strong_enums
-      cxx_trailing_return_types
-      cxx_unicode_literals
-      cxx_uniform_initialization # Not explicit in Intel notes but should do...
-      cxx_user_literals
-      cxx_variadic_macros
-      cxx_variadic_templates
-      )
-
-    if(UNIX)
-      list(APPEND CMAKE_CXX11_COMPILE_FEATURES
-        cxx_unrestricted_unions # Linux/OSX only
-        cxx_thread_local # Linux/OSX only
-        )
+        list(APPEND CMAKE_CXX17_COMPILE_FEATURES cxx_std_17)
+        set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} "${CMAKE_CXX17_COMPILE_FEATURES}")
+      endif()
+    else()
+      if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0)
+        set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17")
+        set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
+        list(APPEND CMAKE_CXX17_COMPILE_FEATURES cxx_std_17)
+        set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} "${CMAKE_CXX17_COMPILE_FEATURES}")
+      endif()
     endif()
   endif()
 
-  # always available?
-  set(CMAKE_CXX98_COMPILE_FEATURES cxx_template_template_parameters)
 
-  set(CMAKE_CXX_COMPILE_FEATURES
-    ${CMAKE_CXX98_COMPILE_FEATURES}
-    ${CMAKE_CXX11_COMPILE_FEATURES}
-    ${CMAKE_CXX14_COMPILE_FEATURES}
-    )
 endif()
-
-