diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-20 13:22:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-20 13:22:30 (GMT) |
| commit | d8fb08a391bddaa2f34dfe913186010a00754c6f (patch) | |
| tree | 26403936eae585242e0f66fb548cae622e8ecdc2 /Modules/Platform | |
| parent | 565213c1fd2d439ebb404cf26f9b1a5c9e9a60e1 (diff) | |
| parent | 64c2342a8d0f3e655349d3897d2dee46a89aaedc (diff) | |
| download | CMake-d8fb08a391bddaa2f34dfe913186010a00754c6f.zip CMake-d8fb08a391bddaa2f34dfe913186010a00754c6f.tar.gz CMake-d8fb08a391bddaa2f34dfe913186010a00754c6f.tar.bz2 | |
Merge topic 'watcom-updates'
64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux
5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version
9292d3b8 Watcom: Detect compiler target architecture and platform
fbc883c9 Watcom: Add one blank line to Makefile for better readability
Diffstat (limited to 'Modules/Platform')
| -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() |