summaryrefslogtreecommitdiffstats
path: root/Source/cmTargetCompileOptionsCommand.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-03-17 13:31:21 (GMT)
committerBrad King <brad.king@kitware.com>2014-03-17 13:31:21 (GMT)
commit6e466c6f2ee5160202aaa76a9d643d34bd7d908a (patch)
tree1117fe63347f333a4e20d1698cb791c6c3506e6a /Source/cmTargetCompileOptionsCommand.h
parentc903b5319bfcf383964c625bb84d7bc958aba2e9 (diff)
parent6313be44aa465ea883e3578b3a0424ae0c217d5c (diff)
downloadCMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.zip
CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.gz
CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.bz2
Merge branch 'master' into CONFIG-LOCATION-CMP0026
Diffstat (limited to 'Source/cmTargetCompileOptionsCommand.h')
-rw-r--r--Source/cmTargetCompileOptionsCommand.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmTargetCompileOptionsCommand.h b/Source/cmTargetCompileOptionsCommand.h
index 3713e5a..d58dc07 100644
--- a/Source/cmTargetCompileOptionsCommand.h
+++ b/Source/cmTargetCompileOptionsCommand.h
@@ -36,7 +36,7 @@ public:
/**
* The name of the command as specified in CMakeList.txt.
*/
- virtual const char* GetName() const { return "target_compile_options";}
+ virtual std::string GetName() const { return "target_compile_options";}
cmTypeMacro(cmTargetCompileOptionsCommand, cmTargetPropCommandBase);