diff options
| author | Jiri Malak <malak.jiri@gmail.com> | 2014-03-17 18:41:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 19:00:59 (GMT) |
| commit | 5d9aa66c91909b8d7eab16edb020c9a14205ba69 (patch) | |
| tree | 0a0b30b2db44f47943add15d36eb1ff9a2c5e803 /Modules/Platform/Windows-wcl386.cmake | |
| parent | 9292d3b8a016fb48f5b5b1518895b6d63e51bc2e (diff) | |
| download | CMake-5d9aa66c91909b8d7eab16edb020c9a14205ba69.zip CMake-5d9aa66c91909b8d7eab16edb020c9a14205ba69.tar.gz CMake-5d9aa66c91909b8d7eab16edb020c9a14205ba69.tar.bz2 | |
Watcom: Introduce OpenWatcom compiler id and fix compiler version
Distinguish "Open Watcom" from old "Watcom" by introducing a new
"OpenWatcom" compiler id. The __WATCOMC__ format is "VVRP" for Watcom
and "VVRP + 1100" for Open Watcom.
Diffstat (limited to 'Modules/Platform/Windows-wcl386.cmake')
| -rw-r--r-- | Modules/Platform/Windows-wcl386.cmake | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake index d40d718..6b1cfd1 100644 --- a/Modules/Platform/Windows-wcl386.cmake +++ b/Modules/Platform/Windows-wcl386.cmake @@ -93,16 +93,18 @@ if(NOT _CMAKE_WATCOM_VERSION) set(WATCOM17) set(WATCOM18) set(WATCOM19) - if("${_compiler_version}" LESS 12.70) - set(WATCOM16 1) - endif() - if("${_compiler_version}" EQUAL 12.70) - set(WATCOM17 1) - endif() - if("${_compiler_version}" EQUAL 12.80) - set(WATCOM18 1) - endif() - if("${_compiler_version}" EQUAL 12.90) - set(WATCOM19 1) + if("${_compiler_id}" STREQUAL "OpenWatcom") + if("${_compiler_version}" VERSION_LESS 1.7) + set(WATCOM16 1) + endif() + if("${_compiler_version}" VERSION_EQUAL 1.7) + set(WATCOM17 1) + endif() + if("${_compiler_version}" VERSION_EQUAL 1.8) + set(WATCOM18 1) + endif() + if("${_compiler_version}" VERSION_EQUAL 1.9) + set(WATCOM19 1) + endif() endif() endif() |