diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-04 15:03:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-04 15:04:28 (GMT) |
| commit | 8541628e27812ba2fb11bc4a4580c1899b207cd1 (patch) | |
| tree | be16dd6bb337b1cf52915e7c4b299819bcec0219 /Source | |
| parent | d08e7480404caa372d2ba4d728581299b675d5dc (diff) | |
| parent | 086c20e9a61ab55c66a305e392c4828ef4dae20c (diff) | |
| download | CMake-8541628e27812ba2fb11bc4a4580c1899b207cd1.zip CMake-8541628e27812ba2fb11bc4a4580c1899b207cd1.tar.gz CMake-8541628e27812ba2fb11bc4a4580c1899b207cd1.tar.bz2 | |
Merge topic 'patch-7'
086c20e9a6 OpenWatcom: Enable 16-bit targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4665
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalWatcomWMakeGenerator.cxx | 10 | ||||
| -rw-r--r-- | Source/cmGlobalWatcomWMakeGenerator.h | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index 07e0793..d6a7afa 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.cxx +++ b/Source/cmGlobalWatcomWMakeGenerator.cxx @@ -44,6 +44,16 @@ void cmGlobalWatcomWMakeGenerator::EnableLanguage( this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } +bool cmGlobalWatcomWMakeGenerator::SetSystemName(std::string const& s, + cmMakefile* mf) +{ + if (mf->GetSafeDefinition("CMAKE_SYSTEM_PROCESSOR") == "I86") { + mf->AddDefinition("CMAKE_GENERATOR_CC", "wcl"); + mf->AddDefinition("CMAKE_GENERATOR_CXX", "wcl"); + } + return this->cmGlobalUnixMakefileGenerator3::SetSystemName(s, mf); +} + void cmGlobalWatcomWMakeGenerator::GetDocumentation( cmDocumentationEntry& entry) { diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h index c0daf8a..c47127f 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.h +++ b/Source/cmGlobalWatcomWMakeGenerator.h @@ -41,6 +41,9 @@ public: /** Get the documentation entry for this generator. */ static void GetDocumentation(cmDocumentationEntry& entry); + /** Tell the generator about the target system. */ + bool SetSystemName(std::string const& s, cmMakefile* mf) override; + /** * Try to determine system information such as shared library * extension, pthreads, byte order etc. |