[Cmake-commits] CMake branch, master, updated. v3.16.0-rc2-145-g336a826f77

Kitware Robot kwrobot at kitware.com
Mon Oct 28 10:16:14 EDT 2019 

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, master has been updated
       via  336a826f77be90229dc3ee82c647148bb02220a9 (commit)
       via  f289ab61e36b94b9b718aa22b55b79b882df7b93 (commit)
       via  3e30c4cc1fb116807feaae326dab3e14c51a8ae7 (commit)
       via  89ad3b395902252e0120d1a3f72f370b20e64e80 (commit)
       via  c97abc96882caab6cba49f6ab1b00ceb88b5a757 (commit)
      from  cb13aa580d918816538e76efb666f1209f0dd717 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=336a826f77be90229dc3ee82c647148bb02220a9
commit 336a826f77be90229dc3ee82c647148bb02220a9
Merge: f289ab61e3 3e30c4cc1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 14:10:29 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 28 10:10:37 2019 -0400

    Merge topic 'framework-tests-multiarch-old-macos'
    
    3e30c4cc1f Tests: Match file command output for older macOS (Framework test)
    89ad3b3959 Tests: Prevent CMP0012 policy warnings in Framework test output
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3954


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f289ab61e36b94b9b718aa22b55b79b882df7b93
commit f289ab61e36b94b9b718aa22b55b79b882df7b93
Merge: cb13aa580d c97abc9688
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 14:05:42 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 28 10:06:40 2019 -0400

    Merge topic 'cpack-nsis-uninstaller-name'
    
    c97abc9688 CPack/NSIS: Add option for custom Uninstall filename
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3945


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e30c4cc1fb116807feaae326dab3e14c51a8ae7
commit 3e30c4cc1fb116807feaae326dab3e14c51a8ae7
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Oct 27 23:29:29 2019 +1100
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Sun Oct 27 23:48:41 2019 +1100

    Tests: Match file command output for older macOS (Framework test)

diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
index f664db91f8..4a92a455aa 100644
--- a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
+++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
@@ -1,3 +1,2 @@
-.*/Framework:( Mach-O universal binary with [^
-]*)? Mach-O[^
+.*/Framework( \(for architecture [^\)]+\))?:[ 	]+Mach-O[^
 ]* dynamically linked shared library.*
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
index 4b5f761af4..dd64717e68 100644
--- a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
+++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
@@ -1,2 +1 @@
-/Framework: (Mach-O universal binary with [^
-]*)?current ar archive random library
+/Framework( \(for architecture [^\)]+\))?:[ 	]+current ar archive random library

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ad3b395902252e0120d1a3f72f370b20e64e80
commit 89ad3b395902252e0120d1a3f72f370b20e64e80
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Oct 27 23:28:17 2019 +1100
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Sun Oct 27 23:28:17 2019 +1100

    Tests: Prevent CMP0012 policy warnings in Framework test output

diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake
index c7e1319c10..965fbf4317 100644
--- a/Tests/RunCMake/Framework/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake
@@ -25,7 +25,7 @@ function(framework_type_test Toolchain Type UseProperty)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
   list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}")
-  if(NOT ${UseProperty})
+  if(NOT UseProperty)
     list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_FRAMEWORK=YES")
   endif()
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c97abc96882caab6cba49f6ab1b00ceb88b5a757
commit c97abc96882caab6cba49f6ab1b00ceb88b5a757
Author:     Johnny Jazeix <jazeix at gmail.com>
AuthorDate: Fri Oct 25 12:08:58 2019 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 25 14:13:25 2019 -0400

    CPack/NSIS: Add option for custom Uninstall filename
    
    Fixes: #10728

diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst
index cd2aea682f..38676c4659 100644
--- a/Help/cpack_gen/nsis.rst
+++ b/Help/cpack_gen/nsis.rst
@@ -128,3 +128,8 @@ on Windows Nullsoft Scriptable Install System.
   set(CPACK_NSIS_MENU_LINKS
       "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake.html"
       "CMake Help" "https://cmake.org" "CMake Web Site")
+
+.. variable:: CPACK_NSIS_UNINSTALL_NAME
+
+ Specify the name of the program to uninstall the version.
+ Default is ``Uninstall``.
diff --git a/Help/release/dev/cpack-nsis-uninstaller-name.rst b/Help/release/dev/cpack-nsis-uninstaller-name.rst
new file mode 100644
index 0000000000..b7ceb4c12a
--- /dev/null
+++ b/Help/release/dev/cpack-nsis-uninstaller-name.rst
@@ -0,0 +1,6 @@
+cpack-nsis-uninstaller-name
+---------------------------
+
+* The :cpack_gen:`CPack NSIS Generator` now supports
+  :variable:`CPACK_NSIS_UNINSTALL_NAME`.
+  This can be used to specify the name of the Uninstall program.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 18098464e7..c912a0a4ae 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -688,6 +688,8 @@ endif()
 # value of CPACK_NSIS_PACKAGE_NAME  instead
 # of CPACK_PACKAGE_INSTALL_DIRECTORY
 _cpack_set_default(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+# Specify the name of the Uninstall file in NSIS
+_cpack_set_default(CPACK_NSIS_UNINSTALL_NAME "Uninstall")
 
 if(CPACK_NSIS_DISPLAY_NAME_SET)
   _cpack_set_default(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_DISPLAY_NAME}")
diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in
index f75ae7836f..c1db769aca 100644
--- a/Modules/Internal/CPack/NSIS.template.in
+++ b/Modules/Internal/CPack/NSIS.template.in
@@ -642,7 +642,7 @@ Section "-Core installation"
   WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
 
   ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  WriteUninstaller "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME at .exe"
   Push "DisplayName"
   Push "@CPACK_NSIS_DISPLAY_NAME@"
   Call ConditionalAddToRegisty
@@ -653,7 +653,7 @@ Section "-Core installation"
   Push "@CPACK_PACKAGE_VENDOR@"
   Call ConditionalAddToRegisty
   Push "UninstallString"
-  Push "$INSTDIR\Uninstall.exe"
+  Push "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME at .exe"
   Call ConditionalAddToRegisty
   Push "NoRepair"
   Push "1"
@@ -690,7 +690,7 @@ Section "-Core installation"
   CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
 @CPACK_NSIS_CREATE_ICONS@
 @CPACK_NSIS_CREATE_ICONS_EXTRA@
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME at .exe"
 
   ;Read a value from an InstallOptions INI file
   !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
@@ -829,7 +829,7 @@ Section "Uninstall"
 !endif
 
   ;Remove the uninstaller itself.
-  Delete "$INSTDIR\Uninstall.exe"
+  Delete "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME at .exe"
   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   ;Remove the installation directory if it is empty.

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

Summary of changes:
 Help/cpack_gen/nsis.rst                                       | 5 +++++
 Help/release/dev/cpack-nsis-uninstaller-name.rst              | 6 ++++++
 Modules/CPack.cmake                                           | 2 ++
 Modules/Internal/CPack/NSIS.template.in                       | 8 ++++----
 Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt | 3 +--
 Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt | 3 +--
 Tests/RunCMake/Framework/RunCMakeTest.cmake                   | 2 +-
 7 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/cpack-nsis-uninstaller-name.rst


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list