diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
| commit | aaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (patch) | |
| tree | fd186e3ee9ba0c4d514baa27d78b8553bcedcb70 /Source/cmForEachCommand.h | |
| parent | faf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (diff) | |
| parent | d64ee80d6bfb97a63953796074e792f4883e5fb2 (diff) | |
| download | CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.zip CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.gz CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.bz2 | |
Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
Diffstat (limited to 'Source/cmForEachCommand.h')
| -rw-r--r-- | Source/cmForEachCommand.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmForEachCommand.h b/Source/cmForEachCommand.h index e548ba8..9b7c85a 100644 --- a/Source/cmForEachCommand.h +++ b/Source/cmForEachCommand.h @@ -59,7 +59,7 @@ public: /** * The name of the command as specified in CMakeList.txt. */ - virtual const char* GetName() const { return "foreach";} + virtual std::string GetName() const { return "foreach";} cmTypeMacro(cmForEachCommand, cmCommand); private: |