diff options
author | Brad King <brad.king@kitware.com> | 2019-12-04 19:21:48 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-04 19:22:01 (GMT) |
commit | e9e0e401c657c60ae7916d93321363ba22d3673a (patch) | |
tree | 2a5f818af7d3fd2c385dbaefa3f8db6a6d6ae7f1 /Source/Checks/cm_cxx14_check.cmake | |
parent | 816aa0740aa2e6f8b15e84c5b9bb95f7b2629847 (diff) | |
parent | fc3b4caa2e6a1970c75830445ef4aa7d03c5a533 (diff) | |
download | CMake-e9e0e401c657c60ae7916d93321363ba22d3673a.zip CMake-e9e0e401c657c60ae7916d93321363ba22d3673a.tar.gz CMake-e9e0e401c657c60ae7916d93321363ba22d3673a.tar.bz2 |
Merge topic 'cmext-memory'
fc3b4caa2e Memory management: cast functions for managed pointers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4064
Diffstat (limited to 'Source/Checks/cm_cxx14_check.cmake')
-rw-r--r-- | Source/Checks/cm_cxx14_check.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Checks/cm_cxx14_check.cmake b/Source/Checks/cm_cxx14_check.cmake index 8e9c2c7..e5656bf 100644 --- a/Source/Checks/cm_cxx14_check.cmake +++ b/Source/Checks/cm_cxx14_check.cmake @@ -1,5 +1,5 @@ set(CMake_CXX14_BROKEN 0) -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|PGI") +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|PGI|Intel") if(NOT CMAKE_CXX14_STANDARD_COMPILE_OPTION) set(CMake_CXX14_WORKS 0) endif() |