Merge topic 'vs10-no-macros'
885ab9ab
VS: Drop reload macros for VS >= 10 (#11258,#14680)
This commit is contained in:
commit
2ee128d9c8
|
@ -0,0 +1,9 @@
|
|||
vs10-no-macros
|
||||
--------------
|
||||
|
||||
* The :generator:`Visual Studio 10 2010` generator no longer checks
|
||||
for running VS IDEs with the project open or asks them to reload.
|
||||
This was originally done for VS 10 because it had been done for
|
||||
VS 7 through 9 to avoid prompting for every project in a solution.
|
||||
Since VS >= 10 allow the whole solution to reload at once they
|
||||
do not need CMake to help them.
|
|
@ -370,39 +370,6 @@ const char* cmGlobalVisualStudio10Generator::GetPlatformToolset() const
|
|||
return 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
std::string cmGlobalVisualStudio10Generator::GetUserMacrosDirectory()
|
||||
{
|
||||
std::string base;
|
||||
std::string path;
|
||||
|
||||
// base begins with the VisualStudioProjectsLocation reg value...
|
||||
if (cmSystemTools::ReadRegistryValue(
|
||||
"HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\10.0;"
|
||||
"VisualStudioProjectsLocation",
|
||||
base))
|
||||
{
|
||||
cmSystemTools::ConvertToUnixSlashes(base);
|
||||
|
||||
// 9.0 macros folder:
|
||||
path = base + "/VSMacros80";
|
||||
// *NOT* a typo; right now in Visual Studio 2008 beta the macros
|
||||
// folder is VSMacros80... They may change it to 90 before final
|
||||
// release of 2008 or they may not... we'll have to keep our eyes
|
||||
// on it
|
||||
}
|
||||
|
||||
// path is (correctly) still empty if we did not read the base value from
|
||||
// the Registry value
|
||||
return path;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
std::string cmGlobalVisualStudio10Generator::GetUserMacrosRegKeyBase()
|
||||
{
|
||||
return "Software\\Microsoft\\VisualStudio\\10.0\\vsmacros";
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
void cmGlobalVisualStudio10Generator::FindMakeProgram(cmMakefile* mf)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -31,8 +31,6 @@ public:
|
|||
///! create the correct local generator
|
||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
||||
|
||||
/** TODO: VS 11 user macro support. */
|
||||
virtual std::string GetUserMacrosDirectory() { return ""; }
|
||||
protected:
|
||||
virtual bool InitializeWindowsPhone(cmMakefile* mf);
|
||||
virtual bool InitializeWindowsStore(cmMakefile* mf);
|
||||
|
|
|
@ -31,9 +31,6 @@ public:
|
|||
///! create the correct local generator
|
||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
||||
|
||||
/** TODO: VS 12 user macro support. */
|
||||
virtual std::string GetUserMacrosDirectory() { return ""; }
|
||||
|
||||
//in Visual Studio 2013 they detached the MSBuild tools version
|
||||
//from the .Net Framework version and instead made it have it's own
|
||||
//version number
|
||||
|
|
|
@ -31,9 +31,6 @@ public:
|
|||
///! create the correct local generator
|
||||
virtual cmLocalGenerator *CreateLocalGenerator();
|
||||
|
||||
/** TODO: VS 14 user macro support. */
|
||||
virtual std::string GetUserMacrosDirectory() { return ""; }
|
||||
|
||||
virtual const char* GetToolsVersion() { return "14.0"; }
|
||||
protected:
|
||||
virtual const char* GetIDEVersion() { return "14.0"; }
|
||||
|
|
|
@ -51,8 +51,8 @@ public:
|
|||
* Call the ReloadProjects macro if necessary based on
|
||||
* GetFilesReplacedDuringGenerate results.
|
||||
*/
|
||||
virtual void CallVisualStudioMacro(MacroName m,
|
||||
const char* vsSolutionFile = 0);
|
||||
void CallVisualStudioMacro(MacroName m,
|
||||
const char* vsSolutionFile = 0);
|
||||
|
||||
// return true if target is fortran only
|
||||
bool TargetIsFortranOnly(cmTarget const& t);
|
||||
|
|
Loading…
Reference in New Issue