[Cmake-commits] CMake branch, next, updated. v2.8.3-1268-g5f8ba54

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5f8ba54c2cd46702c0b0339e5a02d1f06d0c993d (commit)
       via  5c3b0c1f4c2d00cc3adf036c5ff05917cea84cd7 (commit)
      from  f5eb539c639aaff2a78854c66641e6b3802828d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f8ba54c2cd46702c0b0339e5a02d1f06d0c993d
commit 5f8ba54c2cd46702c0b0339e5a02d1f06d0c993d
Merge: f5eb539 5c3b0c1
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 10 10:09:29 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 10 10:09:29 2011 -0500

    Merge topic 'fix-9148-cpack-nsis-installer-root' into next
    
    5c3b0c1 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c3b0c1f4c2d00cc3adf036c5ff05917cea84cd7
commit 5c3b0c1f4c2d00cc3adf036c5ff05917cea84cd7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 10 10:05:13 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Jan 10 10:05:13 2011 -0500

    CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
    
    Control the root directory of the default directory presented to
    the end user of an NSIS installer by a CPack variable.
    
    Previously, the value used in the NSIS script was $PROGRAMFILES,
    which is equivalent to the "ProgramFiles" environment variable.
    That default value is still the same, but now a project may
    override the value by setting this new variable.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 5f9f05f..797ee57 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -210,6 +210,11 @@
 #   CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Registry key used when
 #   installing this project.
 #
+#   CPACK_NSIS_INSTALL_ROOT - The default installation directory presented
+#   to the end user by the NSIS installer is under this root dir. The full
+#   directory presented to the end user is:
+#   ${CPACK_NSIS_INSTALL_ROOT}/${CPACK_PACKAGE_INSTALL_DIRECTORY}
+#
 #   CPACK_NSIS_MUI_ICON - The icon file (.ico) for the generated
 #   install program.
 #
@@ -785,6 +790,11 @@ IF(${__cpack_system_name} MATCHES Windows)
 ENDIF(${__cpack_system_name} MATCHES Windows)
 cpack_set_if_not_set(CPACK_SYSTEM_NAME "${__cpack_system_name}")
 
+# Root dir: default value should be the string literal "$PROGRAMFILES"
+# for backwards compatibility. Projects may set this value to anything.
+set(__cpack_root_default "$PROGRAMFILES")
+cpack_set_if_not_set(CPACK_NSIS_INSTALL_ROOT "${__cpack_root_default}")
+
 # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype>
 cpack_set_if_not_set(CPACK_PACKAGE_FILE_NAME
   "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index ffe0515..df9d2d3 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -25,7 +25,7 @@
   !include "MUI.nsh"
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+  InstallDir "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
 ;--------------------------------
 ;General
@@ -907,7 +907,7 @@ Function .onInit
   ; install directory that is expected to be the
   ; default
   StrCpy $IS_DEFAULT_INSTALLDIR 0
-  StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
+  StrCmp "$INSTDIR" "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
     StrCpy $IS_DEFAULT_INSTALLDIR 1
   
   StrCpy $SV_ALLUSERS "JustMe"
@@ -940,7 +940,7 @@ Function .onInit
   done:
   StrCmp $SV_ALLUSERS "AllUsers" 0 +3
     StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-      StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+      StrCpy $INSTDIR "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
   StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
diff --git a/Tests/CPackComponents/CMakeLists.txt b/Tests/CPackComponents/CMakeLists.txt
index bbe834d..58f5bdf 100644
--- a/Tests/CPackComponents/CMakeLists.txt
+++ b/Tests/CPackComponents/CMakeLists.txt
@@ -78,6 +78,9 @@ set(CPACK_NSIS_MENU_LINKS
   "news://newsserver" "Test News Link"
   )
 
+# Suggested default root for end users of the installer:
+set(CPACK_NSIS_INSTALL_ROOT "C:\\Program Files\\CMake Tests Install Root")
+
 # Include CPack to introduce the appropriate targets
 include(CPack)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPack.cmake                  |   10 ++++++++++
 Modules/NSIS.template.in             |    6 +++---
 Tests/CPackComponents/CMakeLists.txt |    3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake