[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-773-gafb0f66

[Brad King]

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  afb0f66f0f47813de8c9a77659326a8923a6e1c2 (commit)
       via  05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80 (commit)
      from  a3dab54134c6bd015edcc55d88a74204836649ca (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=afb0f66f0f47813de8c9a77659326a8923a6e1c2
commit afb0f66f0f47813de8c9a77659326a8923a6e1c2
Merge: a3dab54 05e05cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 26 15:04:23 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 26 15:04:23 2016 -0400

    Merge topic 'intel-compiler-windows-c++98' into next
    
    05e05cd2 Intel: Fix compiler C++98 standard flag on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80
commit 05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 26 14:56:57 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 26 15:03:53 2016 -0400

    Intel: Fix compiler C++98 standard flag on Windows
    
    The Intel C++ Compiler for Windows does not support the `-Qstd=c++98`
    flag but does support `-Qstd=gnu++98`.
    
    Issue: #16384

diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 73dd7fa..29e02d3 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -34,7 +34,11 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
 endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
-  set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98")
+  if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+    set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=gnu++98")
+  else()
+    set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98")
+  endif()
   set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=${_ext}98")
 endif()
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/Intel-CXX.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake