diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-06 20:54:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-06 20:54:54 (GMT) |
| commit | dba225db334a89aae3835d98f200bb1ce3eb8753 (patch) | |
| tree | 76ff0482790b15a9d15a0d88a8a57c66909138e2 /Source/cmGlobalVisualStudio10Generator.h | |
| parent | 87e0e6e497b76f4ab7292cca34bd7c006832723b (diff) | |
| parent | c90151bd82740ba00ce9d8e72f4026118d5dfa0d (diff) | |
| download | CMake-dba225db334a89aae3835d98f200bb1ce3eb8753.zip CMake-dba225db334a89aae3835d98f200bb1ce3eb8753.tar.gz CMake-dba225db334a89aae3835d98f200bb1ce3eb8753.tar.bz2 | |
Merge topic 'vs-cleanup'
c90151b VS: Unify how the name of the generator is specified
3873d29 Fix detection of WinCE SDKs with 64bit verion of CMake
40a4302 VS12: Remove duplicated overload of UseFolderProperty()
b02f09d VS: Replace ArchitectureId with PlatformName
4b15dc8 VS: Set CMAKE_VS_PLATFORM_NAME for VS7 and VS71 too
60e568c VS10: Do not set the TargetMachine when detecting the compiler
dfbfe6f VS6: Hardcode id_machine_6 for compiler detection
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index dbe6044..21682f8 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -25,7 +25,7 @@ class cmGlobalVisualStudio10Generator : { public: cmGlobalVisualStudio10Generator(const char* name, - const char* architectureId, const char* additionalPlatformDefinition); + const char* platformName, const char* additionalPlatformDefinition); static cmGlobalGeneratorFactory* NewFactory(); virtual bool SetGeneratorToolset(std::string const& ts); |