diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-30 18:26:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-30 18:26:53 (GMT) |
| commit | a24a4e18af1d40d6bf81045c5955aa08b5e51797 (patch) | |
| tree | c47b8503b8bb1bee24bb481dcad4281b82208565 /Source/cmGlobalWatcomWMakeGenerator.cxx | |
| parent | 0173cdcc012945901190e883283adfbbba61f491 (diff) | |
| parent | 2c71d051facad13b0a42a57066be2489d5fff6ea (diff) | |
| download | CMake-a24a4e18af1d40d6bf81045c5955aa08b5e51797.zip CMake-a24a4e18af1d40d6bf81045c5955aa08b5e51797.tar.gz CMake-a24a4e18af1d40d6bf81045c5955aa08b5e51797.tar.bz2 | |
Merge topic 'makefiles-compiler-deps-optims'
2c71d051fa Makefiles Generators: use compiler for dependencies generation
afd0f6785d Refactoring: Abstract Makefile line continuation format
b6068ce407 Refactoring: enhance include file filtering
3401403f69 Refactoring: Introduce place-holder for dependency target.
a97c41bf8b Refactoring: Makefiles Generators: Add support for various depends scanners
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5528
Diffstat (limited to 'Source/cmGlobalWatcomWMakeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalWatcomWMakeGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index d6a7afa..3e2d92d 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.cxx +++ b/Source/cmGlobalWatcomWMakeGenerator.cxx @@ -25,6 +25,7 @@ cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator(cmake* cm) #endif cm->GetState()->SetWatcomWMake(true); this->IncludeDirective = "!include"; + this->LineContinueDirective = "&\n"; this->DefineWindowsNULL = true; this->UnixCD = false; this->MakeSilentFlag = "-h"; @@ -37,7 +38,6 @@ void cmGlobalWatcomWMakeGenerator::EnableLanguage( mf->AddDefinition("WATCOM", "1"); mf->AddDefinition("CMAKE_QUOTE_INCLUDE_PATHS", "1"); mf->AddDefinition("CMAKE_MANGLE_OBJECT_FILE_NAMES", "1"); - mf->AddDefinition("CMAKE_MAKE_LINE_CONTINUE", "&"); mf->AddDefinition("CMAKE_MAKE_SYMBOLIC_RULE", ".SYMBOLIC"); mf->AddDefinition("CMAKE_GENERATOR_CC", "wcl386"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "wcl386"); |