diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
| commit | 6e466c6f2ee5160202aaa76a9d643d34bd7d908a (patch) | |
| tree | 1117fe63347f333a4e20d1698cb791c6c3506e6a /Source/cmGlobalWatcomWMakeGenerator.h | |
| parent | c903b5319bfcf383964c625bb84d7bc958aba2e9 (diff) | |
| parent | 6313be44aa465ea883e3578b3a0424ae0c217d5c (diff) | |
| download | CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.zip CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.gz CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.bz2 | |
Merge branch 'master' into CONFIG-LOCATION-CMP0026
Diffstat (limited to 'Source/cmGlobalWatcomWMakeGenerator.h')
| -rw-r--r-- | Source/cmGlobalWatcomWMakeGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h index d5350ef..2057a42 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.h +++ b/Source/cmGlobalWatcomWMakeGenerator.h @@ -27,9 +27,9 @@ public: return new cmGlobalGeneratorSimpleFactory <cmGlobalWatcomWMakeGenerator>(); } ///! Get the name for the generator. - virtual const char* GetName() const { + virtual std::string GetName() const { return cmGlobalWatcomWMakeGenerator::GetActualName();} - static const char* GetActualName() {return "Watcom WMake";} + static std::string GetActualName() {return "Watcom WMake";} /** Get the documentation entry for this generator. */ static void GetDocumentation(cmDocumentationEntry& entry); |