diff options
author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
tree | 515fcf4fdee211067497339acb52de321640c4fc /Source/cmGlobalVisualStudio10Generator.h | |
parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
-rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 060cdff..47ce790 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -20,26 +20,26 @@ * * cmGlobalVisualStudio10Generator manages UNIX build process for a tree */ -class cmGlobalVisualStudio10Generator : +class cmGlobalVisualStudio10Generator : public cmGlobalVisualStudio8Generator { public: cmGlobalVisualStudio10Generator(); - static cmGlobalGenerator* New() { + static cmGlobalGenerator* New() { return new cmGlobalVisualStudio10Generator; } - - virtual std::string + + virtual std::string GenerateBuildCommand(const char* makeProgram, - const char *projectName, + const char *projectName, const char* additionalOptions, const char *targetName, const char* config, bool ignoreErrors, bool); - + ///! Get the name for the generator. virtual const char* GetName() const { return cmGlobalVisualStudio10Generator::GetActualName();} static const char* GetActualName() {return "Visual Studio 10";} virtual void AddPlatformDefinitions(cmMakefile* mf); - + /** Get the documentation entry for this generator. */ virtual void GetDocumentation(cmDocumentationEntry& entry) const; @@ -50,9 +50,9 @@ public: /** * Try to determine system infomation such as shared library - * extension, pthreads, byte order etc. + * extension, pthreads, byte order etc. */ - virtual void EnableLanguage(std::vector<std::string>const& languages, + virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *, bool optional); virtual void WriteSLNHeader(std::ostream& fout); |