[Cmake-commits] CMake branch, next, updated. v3.1.1-2591-g950f8fe

[Brad King]

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  950f8fe104ee7f45fb1cd2a240bc80ede115e6ad (commit)
       via  ecaee7caca4e3d4528e643736c0620e785e84153 (commit)
      from  6894b2511b2517091d3383b5a6313467919f1847 (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=950f8fe104ee7f45fb1cd2a240bc80ede115e6ad
commit 950f8fe104ee7f45fb1cd2a240bc80ede115e6ad
Merge: 6894b25 ecaee7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 15:25:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 15:25:10 2015 -0500

    Merge topic 'cpack-nsis-win64' into next
    
    ecaee7ca CPack: Fix NSIS default 64-bit Windows install directory (#14211)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecaee7caca4e3d4528e643736c0620e785e84153
commit ecaee7caca4e3d4528e643736c0620e785e84153
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 15:09:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 15:11:10 2015 -0500

    CPack: Fix NSIS default 64-bit Windows install directory (#14211)
    
    When targeting Windows with a 64-bit architecture, use "$PROGRAMFILES64"
    to get the Program Files folder.  Use CMAKE_SIZEOF_VOID_P to check for
    the architecture size instead of CMAKE_CL_64 because the latter is not
    defined for all compilers.
    
    Inspired-by: Hugh Sorby <h.sorby at auckland.ac.nz>
    Inspired-by: İsmail Dönmez <ismail at donmez.ws>

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 35259c4..ce1536e 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -352,8 +352,8 @@ if(CPACK_NSIS_MODIFY_PATH)
 endif()
 
 set(__cpack_system_name ${CMAKE_SYSTEM_NAME})
-if(${__cpack_system_name} MATCHES Windows)
-  if(CMAKE_CL_64)
+if(__cpack_system_name MATCHES "Windows")
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(__cpack_system_name win64)
   else()
     set(__cpack_system_name win32)
@@ -363,7 +363,12 @@ 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")
+# When creating 64 bit binaries we set the default value to "$PROGRAMFILES64"
+if("x${__cpack_system_name}" STREQUAL "xwin64")
+  set(__cpack_root_default "$PROGRAMFILES64")
+else()
+  set(__cpack_root_default "$PROGRAMFILES")
+endif()
 cpack_set_if_not_set(CPACK_NSIS_INSTALL_ROOT "${__cpack_root_default}")
 
 # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype>

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

Summary of changes:
 Modules/CPack.cmake |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake