mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-nsis-multi-installs'

Browse Source 
e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.
This commit is contained in:
David Cole
2011-08-02 15:10:47 -04:00
committed by CMake Topic Stage
parent abc8586716 e6d2bcfde2
commit ab24bdeecc
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackNSISGenerator.cxx
-4
View File
@@ -672,9 +672,6 @@ CreateComponentDescription(cmCPackComponent *component,
}
componentCode += " SetOutPath \"$INSTDIR\"\n";
componentCode += " IntCmp $" + component->Name
+ "_was_installed ${SF_SELECTED} noinstall_" + component->Name + "\n";
// Create the actual installation commands
if (component->IsDownloaded)
{
@@ -825,7 +822,6 @@ CreateComponentDescription(cmCPackComponent *component,
componentCode += " File /r \"${INST_DIR}\\" +
component->Name + "\\*.*\"\n";
}
componentCode += " noinstall_" + component->Name + ":\n";
componentCode += "SectionEnd\n";
// Macro used to remove the component