COMP: Fix for preinstall
This commit is contained in:
parent
743b4c9983
commit
1ecd48ba67
@ -59,6 +59,7 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
|
|||||||
bool doneEditCache = false;
|
bool doneEditCache = false;
|
||||||
bool doneRebuildCache = false;
|
bool doneRebuildCache = false;
|
||||||
bool donePackage = false;
|
bool donePackage = false;
|
||||||
|
bool donePreInstall = false;
|
||||||
|
|
||||||
// For each cmMakefile, create a VCProj for it, and
|
// For each cmMakefile, create a VCProj for it, and
|
||||||
// add it to this SLN file
|
// add it to this SLN file
|
||||||
@ -168,6 +169,17 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
|
|||||||
doneInstall = true;
|
doneInstall = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(l->first == "preinstall")
|
||||||
|
{
|
||||||
|
if(donePreInstall)
|
||||||
|
{
|
||||||
|
skip = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
donePreInstall = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
if(l->first == "RUN_TESTS")
|
if(l->first == "RUN_TESTS")
|
||||||
{
|
{
|
||||||
if(doneRunTests)
|
if(doneRunTests)
|
||||||
|
@ -210,6 +210,11 @@ void cmGlobalVisualStudio7Generator::Generate()
|
|||||||
no_working_dir,
|
no_working_dir,
|
||||||
cmake_command.c_str(),
|
cmake_command.c_str(),
|
||||||
"-DBUILD_TYPE=$(OutDir)", "-P", "cmake_install.cmake");
|
"-DBUILD_TYPE=$(OutDir)", "-P", "cmake_install.cmake");
|
||||||
|
gen[0]->GetMakefile()->
|
||||||
|
AddUtilityCommand("preinstall", false, no_output, no_depends,
|
||||||
|
no_working_dir,
|
||||||
|
cmake_command.c_str(),
|
||||||
|
"-E", "echo", "preinstall");
|
||||||
|
|
||||||
// Make the INSTALL target depend on ALL_BUILD unless the
|
// Make the INSTALL target depend on ALL_BUILD unless the
|
||||||
// project says to not do so.
|
// project says to not do so.
|
||||||
@ -283,6 +288,7 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
|
|||||||
bool doneEditCache = false;
|
bool doneEditCache = false;
|
||||||
bool doneRebuildCache = false;
|
bool doneRebuildCache = false;
|
||||||
bool donePackage = false;
|
bool donePackage = false;
|
||||||
|
bool donePreInstall = false;
|
||||||
|
|
||||||
// For each cmMakefile, create a VCProj for it, and
|
// For each cmMakefile, create a VCProj for it, and
|
||||||
// add it to this SLN file
|
// add it to this SLN file
|
||||||
@ -381,6 +387,17 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
|
|||||||
doneInstall = true;
|
doneInstall = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(l->first == "preinstall")
|
||||||
|
{
|
||||||
|
if(donePreInstall)
|
||||||
|
{
|
||||||
|
skip = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
donePreInstall = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
if(l->first == "RUN_TESTS")
|
if(l->first == "RUN_TESTS")
|
||||||
{
|
{
|
||||||
if(doneRunTests)
|
if(doneRunTests)
|
||||||
@ -743,6 +760,7 @@ void cmGlobalVisualStudio7Generator::Configure()
|
|||||||
cmGlobalGenerator::Configure();
|
cmGlobalGenerator::Configure();
|
||||||
this->CreateGUID("ALL_BUILD");
|
this->CreateGUID("ALL_BUILD");
|
||||||
this->CreateGUID("INSTALL");
|
this->CreateGUID("INSTALL");
|
||||||
|
this->CreateGUID("preinstall");
|
||||||
this->CreateGUID("RUN_TESTS");
|
this->CreateGUID("RUN_TESTS");
|
||||||
this->CreateGUID("EDIT_CACHE");
|
this->CreateGUID("EDIT_CACHE");
|
||||||
this->CreateGUID("REBUILD_CACHE");
|
this->CreateGUID("REBUILD_CACHE");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user