diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-22 16:51:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-22 16:51:55 (GMT) |
| commit | e4e76f286c2eb5cfa822f89145611d02dc9d39b3 (patch) | |
| tree | 093670c695c30e0836fc24eb32365d8de7f89e30 /Source/cmIncludeDirectoryCommand.h | |
| parent | 149ce5db5ed52855514e3ee3eef45295e667eed4 (diff) | |
| parent | ede0419a376cd3ddc26058f910318c76e0077bb1 (diff) | |
| download | CMake-e4e76f286c2eb5cfa822f89145611d02dc9d39b3.zip CMake-e4e76f286c2eb5cfa822f89145611d02dc9d39b3.tar.gz CMake-e4e76f286c2eb5cfa822f89145611d02dc9d39b3.tar.bz2 | |
Merge branch 'master' into osx-CFBundle-info-plist
Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
the side from 'master'.
Diffstat (limited to 'Source/cmIncludeDirectoryCommand.h')
| -rw-r--r-- | Source/cmIncludeDirectoryCommand.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmIncludeDirectoryCommand.h b/Source/cmIncludeDirectoryCommand.h index c621dcb..6cc2c83 100644 --- a/Source/cmIncludeDirectoryCommand.h +++ b/Source/cmIncludeDirectoryCommand.h @@ -41,7 +41,7 @@ public: /** * The name of the command as specified in CMakeList.txt. */ - virtual const char* GetName() const { return "include_directories";} + virtual std::string GetName() const { return "include_directories";} cmTypeMacro(cmIncludeDirectoryCommand, cmCommand); |