summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-06 13:44:49 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-06-06 13:44:49 (GMT)
commit2292b82b1d175a8cb7b48135f0dd619597a2eaa8 (patch)
treec41da313f4711b7e55a193b0a287439b4ef89522
parent47cde18849201c3b58479d38725b554f3ad34eaf (diff)
parent559ae1890188e3561424bfdb4b933d8aa442fa9f (diff)
downloadCMake-2292b82b1d175a8cb7b48135f0dd619597a2eaa8.zip
CMake-2292b82b1d175a8cb7b48135f0dd619597a2eaa8.tar.gz
CMake-2292b82b1d175a8cb7b48135f0dd619597a2eaa8.tar.bz2
Merge topic 'watcom-overhaul-notes'
559ae189 Help: Add notes about new OpenWatcom compiler id and versioning
-rw-r--r--Help/release/dev/OpenWatcom.rst9
-rw-r--r--Help/variable/CMAKE_LANG_COMPILER_ID.rst2
2 files changed, 10 insertions, 1 deletions
diff --git a/Help/release/dev/OpenWatcom.rst b/Help/release/dev/OpenWatcom.rst
new file mode 100644
index 0000000..63f6e8c
--- /dev/null
+++ b/Help/release/dev/OpenWatcom.rst
@@ -0,0 +1,9 @@
+OpenWatcom
+----------
+
+* Support for the Open Watcom compiler has been overhauled.
+ The :variable:`CMAKE_<LANG>_COMPILER_ID` is now ``OpenWatcom``,
+ and the :variable:`CMAKE_<LANG>_COMPILER_VERSION` now uses
+ the Open Watcom external version numbering. The external
+ version numbers are lower than the internal version number
+ by 11.
diff --git a/Help/variable/CMAKE_LANG_COMPILER_ID.rst b/Help/variable/CMAKE_LANG_COMPILER_ID.rst
index cf9c386..f554f4e 100644
--- a/Help/variable/CMAKE_LANG_COMPILER_ID.rst
+++ b/Help/variable/CMAKE_LANG_COMPILER_ID.rst
@@ -20,13 +20,13 @@ include:
Intel = Intel Compiler (intel.com)
MIPSpro = SGI MIPSpro (sgi.com)
MSVC = Microsoft Visual Studio (microsoft.com)
+ OpenWatcom = Open Watcom (openwatcom.org)
PGI = The Portland Group (pgroup.com)
PathScale = PathScale (pathscale.com)
SDCC = Small Device C Compiler (sdcc.sourceforge.net)
SunPro = Oracle Solaris Studio (oracle.com)
TI = Texas Instruments (ti.com)
TinyCC = Tiny C Compiler (tinycc.org)
- Watcom = Open Watcom (openwatcom.org)
XL, VisualAge, zOS = IBM XL (ibm.com)
This variable is not guaranteed to be defined for all compilers or