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/cmGlobalVisualStudio12Generator.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/cmGlobalVisualStudio12Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio12Generator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index 5a4a78d..4557f28 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -20,11 +20,12 @@ class cmGlobalVisualStudio12Generator: public cmGlobalVisualStudio11Generator { public: - cmGlobalVisualStudio12Generator(const char* name, - const char* platformName, const char* additionalPlatformDefinition); + cmGlobalVisualStudio12Generator(const std::string& name, + const std::string& platformName, + const std::string& additionalPlatformDefinition); static cmGlobalGeneratorFactory* NewFactory(); - virtual bool MatchesGeneratorName(const char* name) const; + virtual bool MatchesGeneratorName(const std::string& name) const; virtual void WriteSLNHeader(std::ostream& fout); |