diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-18 15:26:28 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-18 15:26:28 (GMT) |
| commit | ef537ffec7715c4249b3476307014292955e47c2 (patch) | |
| tree | 7b018fa0cfb259d05dd648166001c2bcb7175a30 /Source/CPack | |
| parent | c51a45466dea6d375a089130edf615b47457c593 (diff) | |
| download | CMake-ef537ffec7715c4249b3476307014292955e47c2.zip CMake-ef537ffec7715c4249b3476307014292955e47c2.tar.gz CMake-ef537ffec7715c4249b3476307014292955e47c2.tar.bz2 | |
ENH: have cpack work with DESTDIR install and ingest qt framework libs into cmake-gui
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index ec34058..6c79af4 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -536,6 +536,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( 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 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( { mf->AddDefinition("CMAKE_INSTALL_DO_STRIP", "1"); } - int res = mf->ReadListFile(0, installFile.c_str()); if ( cmSystemTools::GetErrorOccuredFlag() || !res ) { |