[cmake-commits] hoffman committed cmCPackGenerator.cxx 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv2702/Source/CPack

Modified Files:
	cmCPackGenerator.cxx 
Log Message:
ENH: have cpack work with DESTDIR install and ingest qt framework libs into cmake-gui


Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCPackGenerator.cxx	16 Feb 2008 18:02:57 -0000	1.3
+++ cmCPackGenerator.cxx	18 Feb 2008 15:26:28 -0000	1.4
@@ -536,6 +536,7 @@
       cmCPackLogger(cmCPackLog::LOG_OUTPUT,
         "- Install project: " << installProjectName << std::endl);
       cmake cm;
+      cm.AddCMakePaths();
       cm.SetProgressCallback(cmCPackGeneratorProgress, this);
       cmGlobalGenerator gg;
       gg.SetCMakeInstance(&cm);
@@ -596,7 +597,6 @@
         {
         mf->AddDefinition("CMAKE_INSTALL_DO_STRIP", "1");
         }
-
       int res = mf->ReadListFile(0, installFile.c_str());
       if ( cmSystemTools::GetErrorOccuredFlag() || !res )
         {