diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
| commit | 8018fcca6e055a0f12a17fc8324128080a9ec568 (patch) | |
| tree | accecb14f80dece735e2822b76ad0c88825149b6 /Source/cmSubdirDependsCommand.h | |
| parent | a41c0a9dcbc201b183bcc0a0c0f6bf9f2cebd079 (diff) | |
| parent | 5ada4be81bdb7695b2a4741db76ec66473ccd961 (diff) | |
| download | CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.zip CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.gz CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.bz2 | |
Merge branch 'master' into revise-compiler-id-policies
Diffstat (limited to 'Source/cmSubdirDependsCommand.h')
| -rw-r--r-- | Source/cmSubdirDependsCommand.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmSubdirDependsCommand.h b/Source/cmSubdirDependsCommand.h index f78cfb7..75a5685 100644 --- a/Source/cmSubdirDependsCommand.h +++ b/Source/cmSubdirDependsCommand.h @@ -20,7 +20,7 @@ public: virtual cmCommand* Clone() { return new cmSubdirDependsCommand; } virtual bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus &status); - virtual const char* GetName() const { return "subdir_depends";} + virtual std::string GetName() const { return "subdir_depends";} virtual bool IsDiscouraged() const { return true; } cmTypeMacro(cmSubdirDependsCommand, cmCommand); }; |