From 1ecd48ba67b2e0d02227f848468f9398ec183be2 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Fri, 24 Feb 2006 09:32:27 -0500
Subject: COMP: Fix for preinstall

---
 Source/cmGlobalVisualStudio71Generator.cxx | 12 ++++++++++++
 Source/cmGlobalVisualStudio7Generator.cxx  | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index ad31d5a..13d08a0 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -59,6 +59,7 @@ void cmGlobalVisualStudio71Generator::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
@@ -168,6 +169,17 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
               doneInstall = true;
               }
             }
+          if(l->first == "preinstall")
+            {
+            if(donePreInstall)
+              {
+              skip = true;
+              }
+            else
+              {
+              donePreInstall = true;
+              }
+            }
           if(l->first == "RUN_TESTS")
             {
             if(doneRunTests)
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");
-- 
cgit v0.12