diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-02 19:10:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-02 19:10:47 (GMT) |
| commit | ab24bdeecc985f197d637cb593008ae29ae882cb (patch) | |
| tree | a7fcaff187d68398420d1f9eba22c601930107af /Source/CPack | |
| parent | abc85867169a92f189d6378e95d062f24aa1bd93 (diff) | |
| parent | e6d2bcfde2c0cd254ce1461e368ff79eb0010473 (diff) | |
| download | CMake-ab24bdeecc985f197d637cb593008ae29ae882cb.zip CMake-ab24bdeecc985f197d637cb593008ae29ae882cb.tar.gz CMake-ab24bdeecc985f197d637cb593008ae29ae882cb.tar.bz2 | |
Merge topic 'cpack-nsis-multi-installs'
e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index a1f4f2e..2b94067 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -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 |