CPack NSIS fixes and feature #2
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously both CPACK_NSIS_MUI_ICON and CPACK_NSIS_MUI_UNIICON needed to be set for either to take effect. This commit allows either to be set rather than requiring both as users may well want to e.g. use a default uninstall icon but a custom install icon.
NSIS installers default to assuming the executables exist in a directory named "bin" under the installation directory. As this isn't usual for Windows programs the addition of this variable allows the customisation of this directory and links still to be created correctly.
MUI_FINISHPAGE_RUN is frequently used with NSIS and provides a checkbox on the finish page of an installer which specifies whether the specified executable should be run when the installer exits. This commit adds support for this setting in CPack.
|
Seems to be merged, thanks! |
hjmjohnson
added a commit
to hjmjohnson/CMake
that referenced
this pull request
Jun 30, 2012
Separate lower case conversion for build. This changes all the CMake key words to lower case. The primary reason for changing key words is that all documentation for CMakeLists.txt now shows the key words as lower case. Even the printed “Mastering CMake v5” uses lower case. I’ve come across this several times in my class where students stumble over the fact that the documentation about Cmake does not match the implementation in ITK. A script (a wrapper around a vim macro) written that can make these substituions reliably (Tested on the BRAINS tree, the Slicer3 tree, CMake and the ITK tree without causing any errors). More complete documentation can be found in ITK/Utilities/Maintenance/HowToCreateTheCMakeCaseConversion.txt CMake files are taken as a reference materials for many other tools, and the conventions shown in these files are often copied and pasted in many other packages. By making these consistent, a more uniform look and feel can be acheived across cmake compliant packages. HOW TO REPLICATE: This is documentation for the process to convert all CMakeLists.txt files to lower case format (as seems to be the default style in all recent documentation). Step Kitware#1: Determine all the cmake commands: TMP_DIR=/tmp cmake --help-command-list > ${TMP_DIR}/firstpass_script.vi Step Kitware#2: Use vim to convert the list into a vim compliant script file that can be applied to each file: Open firstpass_script.vi in vim, and issue the following substitution: vim ${TMP_DIR}/firstpass_script.vi :%s/^\(.*\)/:%s#\\<\U\1\\> *(#\l\1(#\ge/ge <<< Add ":%s/ *$//ge" to remove end of line spaces. <<< Add ":wqa" to end of the vim script >>> <<< Add ":%s#\<SUBDIRS\> *(#add_subdirectory(#ge" >>> :w! /tmp/convert_cmake_to_lowercase.vim This will create a file that is suitable for using as a vim batch script. Step Kitware#3: Make list of files to convert =============================================================== \#!/bin/bash VIM_SCRIPT=$(dirname $0)/convert_cmake_to_lowercase.vim PROCESS_DIR=$1 FILESTOCONVERT=/tmp/FileToConvert find . -name CMakeLists.txt |fgrep -v svn > ${FILESTOCONVERT} find . -name "*.cmake*" |fgrep -v svn >>${FILESTOCONVERT} if [ ! -f "${VIM_SCRIPT}" ]; then echo "${VIM_SCRIPT} not found" exit -1· fi old_IFS=$IFS IFS=$'\n' for ff in $(cat ${FILESTOCONVERT}|fgrep -v svn); do echo "PROCESSING $ff" vim -S ${VIM_SCRIPT} $ff if [ -f stop ]; then exit -1 fi done IFS=$old_IFS ===============================================================
kwrobot
pushed a commit
that referenced
this pull request
Oct 2, 2012
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Patches to fix the following issues:
http://www.vtk.org/Bug/view.php?id=11143 http://www.vtk.org/Bug/view.php?id=7828 http://www.vtk.org/Bug/view.php?id=11144
I'm aware I may need to create tests for these, asking for advice by email. Let me know of any other changes needed and I'll update ASAP.