mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-03 21:00:01 -05:00
VS: Fix access violation when calling Visual Studio macro
Fixes: #19730
This commit is contained in:
@@ -45,6 +45,14 @@ static cmVS7FlagTable cmVS7ExtraFlagTable[] = {
|
||||
{ "", "", "", "", 0 }
|
||||
};
|
||||
|
||||
namespace {
|
||||
std::string GetSLNFile(cmLocalGenerator* root)
|
||||
{
|
||||
return cmStrCat(root->GetCurrentBinaryDirectory(), '/',
|
||||
root->GetProjectName(), ".sln");
|
||||
}
|
||||
}
|
||||
|
||||
cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator(
|
||||
cmake* cm, std::string const& platformInGeneratorName)
|
||||
: cmGlobalVisualStudioGenerator(cm, platformInGeneratorName)
|
||||
@@ -286,8 +294,10 @@ void cmGlobalVisualStudio7Generator::Generate()
|
||||
this->OutputSLNFile();
|
||||
// If any solution or project files changed during the generation,
|
||||
// tell Visual Studio to reload them...
|
||||
if (!cmSystemTools::GetErrorOccuredFlag()) {
|
||||
this->CallVisualStudioMacro(MacroReload);
|
||||
if (!cmSystemTools::GetErrorOccuredFlag() &&
|
||||
!this->LocalGenerators.empty()) {
|
||||
this->CallVisualStudioMacro(MacroReload,
|
||||
GetSLNFile(this->LocalGenerators[0]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -298,8 +308,7 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile(
|
||||
return;
|
||||
}
|
||||
this->CurrentProject = root->GetProjectName();
|
||||
std::string fname = cmStrCat(root->GetCurrentBinaryDirectory(), '/',
|
||||
root->GetProjectName(), ".sln");
|
||||
std::string fname = GetSLNFile(root);
|
||||
cmGeneratedFileStream fout(fname.c_str());
|
||||
fout.SetCopyIfDifferent(true);
|
||||
if (!fout) {
|
||||
|
||||
@@ -288,11 +288,10 @@ void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros()
|
||||
}
|
||||
|
||||
void cmGlobalVisualStudioGenerator::CallVisualStudioMacro(
|
||||
MacroName m, const char* vsSolutionFile)
|
||||
MacroName m, const std::string& vsSolutionFile)
|
||||
{
|
||||
// If any solution or project files changed during the generation,
|
||||
// tell Visual Studio to reload them...
|
||||
cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
|
||||
std::string dir = this->GetUserMacrosDirectory();
|
||||
|
||||
// Only really try to call the macro if:
|
||||
@@ -307,27 +306,18 @@ void cmGlobalVisualStudioGenerator::CallVisualStudioMacro(
|
||||
if (cmSystemTools::FileExists(macrosFile.c_str()) &&
|
||||
IsVisualStudioMacrosFileRegistered(
|
||||
macrosFile, this->GetUserMacrosRegKeyBase(), nextSubkeyName)) {
|
||||
std::string topLevelSlnName;
|
||||
if (vsSolutionFile) {
|
||||
topLevelSlnName = vsSolutionFile;
|
||||
} else {
|
||||
topLevelSlnName =
|
||||
cmStrCat(mf->GetCurrentBinaryDirectory(), '/',
|
||||
this->LocalGenerators[0]->GetProjectName(), ".sln");
|
||||
}
|
||||
|
||||
if (m == MacroReload) {
|
||||
std::vector<std::string> filenames;
|
||||
this->GetFilesReplacedDuringGenerate(filenames);
|
||||
if (!filenames.empty()) {
|
||||
std::string projects = cmJoin(filenames, ";");
|
||||
cmCallVisualStudioMacro::CallMacro(
|
||||
topLevelSlnName, CMAKE_VSMACROS_RELOAD_MACRONAME, projects,
|
||||
vsSolutionFile, CMAKE_VSMACROS_RELOAD_MACRONAME, projects,
|
||||
this->GetCMakeInstance()->GetDebugOutput());
|
||||
}
|
||||
} else if (m == MacroStop) {
|
||||
cmCallVisualStudioMacro::CallMacro(
|
||||
topLevelSlnName, CMAKE_VSMACROS_STOP_MACRONAME, "",
|
||||
vsSolutionFile, CMAKE_VSMACROS_STOP_MACRONAME, "",
|
||||
this->GetCMakeInstance()->GetDebugOutput());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
* Call the ReloadProjects macro if necessary based on
|
||||
* GetFilesReplacedDuringGenerate results.
|
||||
*/
|
||||
void CallVisualStudioMacro(MacroName m, const char* vsSolutionFile = 0);
|
||||
void CallVisualStudioMacro(MacroName m, const std::string& vsSolutionFile);
|
||||
|
||||
// return true if target is fortran only
|
||||
bool TargetIsFortranOnly(const cmGeneratorTarget* gt);
|
||||
|
||||
+1
-1
@@ -1751,7 +1751,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
|
||||
cmGlobalVisualStudioGenerator* gg =
|
||||
static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
|
||||
gg->CallVisualStudioMacro(cmGlobalVisualStudioGenerator::MacroStop,
|
||||
this->VSSolutionFile.c_str());
|
||||
this->VSSolutionFile);
|
||||
}
|
||||
#endif
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user