[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-696-g7bb7361

[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  7bb73610186700b8e09935ec959d807cd330dc87 (commit)
       via  9e505285e3c5fc2556d8638c0e0d0228aaeee95d (commit)
       via  cd1415b548cd19652d71056dff09f0c31a8260a0 (commit)
      from  603d1e542663bc45ff0169dd513d2db40e02901c (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=7bb73610186700b8e09935ec959d807cd330dc87
commit 7bb73610186700b8e09935ec959d807cd330dc87
Merge: 603d1e5 9e50528
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 15:10:14 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 15:10:14 2016 -0400

    Merge topic 'cpack-ifw-list-variable' into next
    
    9e505285 CPackIFW: Using cpack_append_list_variable_set_command
    cd1415b5 CPackComponents: add cpack_append_list_variable_set_command


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e505285e3c5fc2556d8638c0e0d0228aaeee95d
commit 9e505285e3c5fc2556d8638c0e0d0228aaeee95d
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Jun 28 22:19:05 2016 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Wed Jun 29 19:14:05 2016 +0300

    CPackIFW: Using cpack_append_list_variable_set_command
    
    This is necessary for proper processing of the list items.

diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 083fc28..2f0e03e 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -571,7 +571,7 @@ macro(cpack_ifw_configure_component compname)
   endforeach()
 
   foreach(_IFW_ARG_NAME ${_IFW_MULTI_ARGS})
-  cpack_append_variable_set_command(
+  cpack_append_list_variable_set_command(
     CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_${_IFW_ARG_NAME}
     _CPACK_IFWCOMP_STR)
   endforeach()
@@ -604,7 +604,7 @@ macro(cpack_ifw_configure_component_group grpname)
   endforeach()
 
   foreach(_IFW_ARG_NAME ${_IFW_MULTI_ARGS})
-  cpack_append_variable_set_command(
+  cpack_append_list_variable_set_command(
     CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_${_IFW_ARG_NAME}
     _CPACK_IFWGRP_STR)
   endforeach()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd1415b548cd19652d71056dff09f0c31a8260a0
commit cd1415b548cd19652d71056dff09f0c31a8260a0
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Jun 28 22:06:17 2016 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Wed Jun 29 19:10:41 2016 +0300

    CPackComponents: add cpack_append_list_variable_set_command
    
    It's like add variable, but wrap each item to quotes.
    Can be used for multi args properties.

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index 038a717..6a33086 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -360,6 +360,20 @@ macro(cpack_append_string_variable_set_command var strvar)
   endif ()
 endmacro()
 
+# Macro that appends a SET command for the given list variable name (var)
+# to the macro named strvar, but only if the variable named "var"
+# has been defined. It's like add variable, but wrap each item to quotes.
+# The string will eventually be appended to a CPack configuration file.
+macro(cpack_append_list_variable_set_command var strvar)
+  if (DEFINED ${var})
+    string(APPEND ${strvar} "set(${var}")
+    foreach(_val IN LISTS ${var})
+      string(APPEND ${strvar} "\n  \"${_val}\"")
+    endforeach()
+    string(APPEND ${strvar} ")\n")
+  endif ()
+endmacro()
+
 # Macro that appends a SET command for the given variable name (var)
 # to the macro named strvar, but only if the variable named "var"
 # has been set to true. The string will eventually be

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

Summary of changes:
 Modules/CPackComponent.cmake |   14 ++++++++++++++
 Modules/CPackIFW.cmake       |    4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake