This condition needs to follow the same pattern added in note `[1]` by
commit a5a3642f (Features: Port Intel CXX features to test macros where
possible, 2016-10-26).  It was accidentally left out of that commit.

Since this compiler always defines `__cplusplus` to `1` we need to use
`_MSC_VER`, `__INTEL_CXX11_MODE__`, and the feature test macro named
`__cpp_aggregate_nsdmi` to detect C++11 and C++14 modes.

With no `-Qstd=` flag this compiler defaults to C++98 plus a subset of
C++11/C++14 features needed to be compatible with MSVC.  We pretend it
is plain C++98 and add a `-Qstd=` flag whenever needed for C++11 or
above features even if they would happen to be available in MSVC-mode.

Closes: #16384

The Intel 16 and 17 compilers define feature test macros of the form
`__cpp_<feature>`.  Use them where possible to detect corresponding
features.

The change in commit 05e05cd2 (Intel: Fix compiler C++98 standard flag
on Windows, 2016-10-26) was wrong.  The Intel C++ Compiler for Windows
does not support either `-Qstd=c++98` or `-Qstd=gnu++98`.  Simply remove
both flags for this compiler and use no options at all to achieve this
mode.

Issue: #16384

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

e81c323d Include necessary headers in commands

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

335a29cb Enable Unicode output to Windows consoles

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

05e05cd2 Intel: Fix compiler C++98 standard flag on Windows

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

554b4f90 Features: Record features for Intel C++ 17 on UNIX

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

0caca40f VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 Express

Refactoring in commit 584ab528 (VS: Add internal API to get platform
toolset as string, 2016-10-18) accidentally changed the semantics of the
original `cmGlobalVisualStudio10Generator::GetPlatformToolset`
implementation to return a pointer to an empty string instead of
`nullptr` when no toolset is configured.  This broke cases that tested
for `nullptr` to detect the lack of any specific toolset, such as the
call in `Find64BitTools`.  Restore the `nullptr` return in this case.

The Intel C++ Compiler for Windows does not support the `-Qstd=c++98`
flag but does support `-Qstd=gnu++98`.

Issue: #16384

Use KWSys ConsoleBuf to replace the `streambuf` on `std::cout` and
`std::cerr` so that process output can be encoded correctly for display
in a Windows console.

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

69fc7bf8 VS: Choose flag map based on the toolset name
e2ed9a70 VS: Move toolset flag table lookup to global generator
584ab528 VS: Add internal API to get platform toolset as string

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

51cfba8c Merge branch 'upstream-KWSys' into update-kwsys
53862f04 KWSys 2016-10-23 (b630d2f5)

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

68e7250a Features: Fix cxx_right_angle_brackets compiler feature test

Issue: #16384

Alex Wang authored 8 years ago and Brad King committed 8 years ago

The clang-format pass in commit v3.6.0-rc1~54^2~1 (Revise C++ coding
style using clang-format, 2016-05-16) changed the template right angle
brackets from `>>` to `> >`, which defeats the purpose of this test.
Change it back and exclude this content from formatting.

Don Olmstead authored 8 years ago and Brad King committed 8 years ago

MSBuild interprets the `.vcxproj` content based on the `PlatformToolset`
setting, so our reverse mapping needs to be based on that setting too.
For VS 2010 and above, choose the flag map to match the toolset name
rather than the generator VS version.

Issue: #16153

Don Olmstead authored 8 years ago and Brad King committed 8 years ago

Move `Get*FlagTable` methods to the global generator and have each VS
generator version pre-populate its default flag table.

* upstream-KWSys:
  KWSys 2016-10-23 (b630d2f5)

Kitware Robot authored 8 years ago and Brad King committed 8 years ago

Code extracted from:

    http://public.kitware.com/KWSys.git

at commit b630d2f5575be7d70c214bfffc57aaf5069c6369 (master).

Upstream Shortlog
-----------------

Dāvis Mosāns (1):
      b630d2f5 ConsoleBuf: Check for actual console with GetConsoleMode

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

c15dc197 Introduce CM_UNORDERED_SET

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

15aa814b Remove cmObject.h and cmTypeMacro.h

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

881585f9 Intel: Fix compiler extension flags on Windows

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

9f1429e2 Sublime: Update generated diagnostic matching expression for MSVC

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

4c272adb Android: Link position-independent executables with proper flags
6205f179 Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

87cc9bfc Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dir
e983bd32 Ninja: Use binary dir for `$subdir/all` targets
42db2ebc Ninja: Use binary dir for `$subdir/all` targets

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

9b8dc79c cmake-server: Change message wrapper to avoid ambiguity with content

Avoid duplicating switch among std::unordered_set, cmsys::hash_set, and
std::set.

Change our message wrapper from

    [== CMake Server ==[ ... ]== CMake Server ==]

to

    [== "CMake Server" ==[ ... ]== "CMake Server" ==]

to guarantee that no JSON content can ever contain the ending string
(because it would be encoded as `]== \"CMake Server\" ==]`).