diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-15 13:30:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-15 13:58:42 (GMT) |
| commit | 885ab9ab37b1f4c094036814882886f5ec9efaf4 (patch) | |
| tree | 4f20a6ab6c4f846c420f400fe97322e168098235 /Source/cmGlobalVisualStudio10Generator.h | |
| parent | cdc53b62c20605467334ecb80c474533e04ff26c (diff) | |
| download | CMake-885ab9ab37b1f4c094036814882886f5ec9efaf4.zip CMake-885ab9ab37b1f4c094036814882886f5ec9efaf4.tar.gz CMake-885ab9ab37b1f4c094036814882886f5ec9efaf4.tar.bz2 | |
VS: Drop reload macros for VS >= 10 (#11258,#14680)
We never implemented them for VS 11 (2012), 12 (2013), or 14 (2015).
For VS 10 (2010) the reload macro does not work correctly when run from
inside a build launched through the IDE because stopping the build kills
the CMake that is driving the reload. Fortunately VS >= 10 know how to
reload the whole solution anyway.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 92202ba..f0dd7d7 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -84,18 +84,6 @@ public: bool TargetsWindowsStore() const { return this->SystemIsWindowsStore; } - /** - * Where does this version of Visual Studio look for macros for the - * current user? Returns the empty string if this version of Visual - * Studio does not implement support for VB macros. - */ - virtual std::string GetUserMacrosDirectory(); - - /** - * What is the reg key path to "vsmacros" for this version of Visual - * Studio? - */ - virtual std::string GetUserMacrosRegKeyBase(); virtual const char* GetCMakeCFGIntDir() const { return "$(Configuration)";} bool Find64BitTools(cmMakefile* mf); @@ -156,5 +144,8 @@ private: virtual std::string FindMSBuildCommand(); virtual std::string FindDevEnvCommand(); virtual std::string GetVSMakeProgram() { return this->GetMSBuildCommand(); } + + // We do not use the reload macros for VS >= 10. + virtual std::string GetUserMacrosDirectory() { return ""; } }; #endif |