diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-27 15:58:20 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-27 15:58:20 (GMT) |
| commit | ee227d3af5c0d5abcb8816e34809df60b9665ec1 (patch) | |
| tree | 2575658691b780ee4f6a4e0d8d059639e6925b54 /Modules | |
| parent | ac99baa44d985ddbf6f767090c49583bdd8f1aa4 (diff) | |
| download | CMake-ee227d3af5c0d5abcb8816e34809df60b9665ec1.zip CMake-ee227d3af5c0d5abcb8816e34809df60b9665ec1.tar.gz CMake-ee227d3af5c0d5abcb8816e34809df60b9665ec1.tar.bz2 | |
ENH: Several packaging issues. Allow random variables to be passed to cpack (anything starting with CPACK_, add preinstall to the list of dependencies for package, fix typos
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.Info.plist.in | 4 | ||||
| -rw-r--r-- | Modules/CPack.cmake | 9 | ||||
| -rw-r--r-- | Modules/NSIS.template.in | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Modules/CPack.Info.plist.in b/Modules/CPack.Info.plist.in index 622b288..5ad9a37 100644 --- a/Modules/CPack.Info.plist.in +++ b/Modules/CPack.Info.plist.in @@ -4,9 +4,9 @@ <plist version="1.0"> <dict> <key>IFMajorVersion</key> -<integer>@CPACK_PACKAGE_MAJOR_VERSION@</integer> +<integer>@CPACK_PACKAGE_VERSION_MAJOR@</integer> <key>IFMinorVersion</key> -<integer>@CPACK_PACKAGE_MINOR_VERSION@</integer> +<integer>@CPACK_PACKAGE_VERSION_MINOR@</integer> <key>IFPkgFlagAllowBackRev</key> <false/> <key>IFPkgFlagAuthorizationAction</key> diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 2a80741..9b3689d 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -82,4 +82,13 @@ IF(CMake_INSTALL_SYSTEM_RUNTIME_LIBS) ENDIF(WIN32) ENDIF(CMake_INSTALL_SYSTEM_RUNTIME_LIBS) +SET(_CPACK_UNUSED_VARIABLES_) +GET_CMAKE_PROPERTY(res VARIABLES) +FOREACH(var ${res}) + IF("xxx${var}" MATCHES "xxxCPACK") + SET(_CPACK_OTHER_VARIABLES_ + "${_CPACK_OTHER_VARIABLES_}\nSET(${var} \"${${var}}\")") + ENDIF("xxx${var}" MATCHES "xxxCPACK") +ENDFOREACH(var ${res}) + CONFIGURE_FILE("${cpack_input_file}" "${CMAKE_BINARY_DIR}/CPackConfig.cmake" @ONLY IMMEDIATE) diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index e84a112..87f8c66 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -355,7 +355,6 @@ Section "Dummy Section" SecDummy ;Create shortcuts CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" @CPACK_NSIS_CREATE_ICONS@ -@CPACK_NSIS_CREATE_EXTRA_ICONS@ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@ @@ -415,7 +414,6 @@ Section "Uninstall" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @CPACK_NSIS_DELETE_ICONS@ -@CPACK_NSIS_DELETE_EXTRA_ICONS@ ;Delete empty start menu parent diretories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" |