diff options
author | Brad King <brad.king@kitware.com> | 2014-07-18 14:57:02 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-18 14:57:02 (GMT) |
commit | e27b2c3fa542a400a14176a7753d0daac36c1ed4 (patch) | |
tree | 8b15fe07bbb247058c4a99d808d8018a5e68ef32 /Source/cmGlobalVisualStudioGenerator.h | |
parent | 5a128c8ec9090a6785c3674ee9ac402283c4e59a (diff) | |
parent | 7a526c35f60ced43606bf028a21dedfaac77c2e9 (diff) | |
download | CMake-e27b2c3fa542a400a14176a7753d0daac36c1ed4.zip CMake-e27b2c3fa542a400a14176a7753d0daac36c1ed4.tar.gz CMake-e27b2c3fa542a400a14176a7753d0daac36c1ed4.tar.bz2 |
Merge topic 'delay-generator-platform'
7a526c35 VS: Delay getting platform name in local generator
e7fdb44b VS: Delay detection of VS 10 Express 64-bit tools
6e176e6d VS: Delay platform definitions until system name is known
d3d9218a VS: Remove unused method from VS 9 generator
eeb60102 VS: Refactor CMAKE_FORCE_*64 platform definitions
ecb34faa Tell generators about CMAKE_SYSTEM_NAME as soon as it is known
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.h')
-rw-r--r-- | Source/cmGlobalVisualStudioGenerator.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index 1ab8990..05dbb11 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -97,8 +97,6 @@ protected: virtual const char* GetIDEVersion() = 0; - virtual void AddPlatformDefinitions(cmMakefile* mf); - virtual bool ComputeTargetDepends(); class VSDependSet: public std::set<std::string> {}; class VSDependMap: public std::map<cmTarget const*, VSDependSet> {}; @@ -111,7 +109,6 @@ protected: std::string GetUtilityDepend(cmTarget const* target); typedef std::map<cmTarget const*, std::string> UtilityDependsMap; UtilityDependsMap UtilityDepends; - std::string AdditionalPlatformDefinition; private: virtual std::string GetVSMakeProgram() = 0; |