summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-24 14:32:27 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-24 14:32:27 (GMT)
commit1ecd48ba67b2e0d02227f848468f9398ec183be2 (patch)
tree1b7fff3097894288620cb113fc6321c66fae5c91 /Source/cmGlobalVisualStudio7Generator.cxx
parent743b4c99831ef6cb44cdd33d0b6fb7fa3ec1ab68 (diff)
downloadCMake-1ecd48ba67b2e0d02227f848468f9398ec183be2.zip
CMake-1ecd48ba67b2e0d02227f848468f9398ec183be2.tar.gz
CMake-1ecd48ba67b2e0d02227f848468f9398ec183be2.tar.bz2
COMP: Fix for preinstall
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx18
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 9fcedac..22fb9d2 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -210,6 +210,11 @@ void cmGlobalVisualStudio7Generator::Generate()
no_working_dir,
cmake_command.c_str(),
"-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
// project says to not do so.
@@ -283,6 +288,7 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
bool doneEditCache = false;
bool doneRebuildCache = false;
bool donePackage = false;
+ bool donePreInstall = false;
// For each cmMakefile, create a VCProj for it, and
// add it to this SLN file
@@ -381,6 +387,17 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
doneInstall = true;
}
}
+ if(l->first == "preinstall")
+ {
+ if(donePreInstall)
+ {
+ skip = true;
+ }
+ else
+ {
+ donePreInstall = true;
+ }
+ }
if(l->first == "RUN_TESTS")
{
if(doneRunTests)
@@ -743,6 +760,7 @@ void cmGlobalVisualStudio7Generator::Configure()
cmGlobalGenerator::Configure();
this->CreateGUID("ALL_BUILD");
this->CreateGUID("INSTALL");
+ this->CreateGUID("preinstall");
this->CreateGUID("RUN_TESTS");
this->CreateGUID("EDIT_CACHE");
this->CreateGUID("REBUILD_CACHE");