[Cmake-commits] CMake branch, next, updated. v3.5.0-642-g89b6090

[Nils Gladitz]

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  89b60904cdd2d27cd9dbeea919b267522524702d (commit)
       via  c70ac0970dde1510322ed3a398f8656e38ae06c8 (commit)
       via  02166c33dbeae976b2b1d1289c57f2648bb70efd (commit)
      from  f6693dca380152ff9bfd2e06daf800de9edf95b1 (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=89b60904cdd2d27cd9dbeea919b267522524702d
commit 89b60904cdd2d27cd9dbeea919b267522524702d
Merge: f6693dc c70ac09
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Mar 24 04:37:58 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 24 04:37:58 2016 -0400

    Merge topic 'cpackcomponents-priv-var' into next
    
    c70ac097 CPack: Exclude additional internal variables from CPackConfig.cmake
    02166c33 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c70ac0970dde1510322ed3a398f8656e38ae06c8
commit c70ac0970dde1510322ed3a398f8656e38ae06c8
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Mar 24 09:28:41 2016 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Mar 24 09:28:41 2016 +0100

    CPack: Exclude additional internal variables from CPackConfig.cmake
    
    In v2.8.12.1-654-g7621ad6 I added underscore prefixes to
    CPACK_ADDCOMP_(STR|UNAME) to prevent them from being automatically
    written to CPackConfig.cmake.
    
    Do the same for CPACK_ADDGRP_(STR|UNAME) and CPACK_INSTTYPE_(STR|UNAME).

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index 96d5609..038a717 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -444,60 +444,60 @@ endmacro()
 
 # Macro that adds a component group to the CPack installer
 macro(cpack_add_component_group grpname)
-  string(TOUPPER ${grpname} CPACK_ADDGRP_UNAME)
-  cpack_parse_arguments(CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}
+  string(TOUPPER ${grpname} _CPACK_ADDGRP_UNAME)
+  cpack_parse_arguments(CPACK_COMPONENT_GROUP_${_CPACK_ADDGRP_UNAME}
     "DISPLAY_NAME;DESCRIPTION;PARENT_GROUP"
     "EXPANDED;BOLD_TITLE"
     ${ARGN}
     )
 
-  set(CPACK_ADDGRP_STR "\n# Configuration for component group \"${grpname}\"\n")
+  set(_CPACK_ADDGRP_STR "\n# Configuration for component group \"${grpname}\"\n")
   cpack_append_string_variable_set_command(
-    CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}_DISPLAY_NAME
-    CPACK_ADDGRP_STR)
+    CPACK_COMPONENT_GROUP_${_CPACK_ADDGRP_UNAME}_DISPLAY_NAME
+    _CPACK_ADDGRP_STR)
   cpack_append_string_variable_set_command(
-    CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}_DESCRIPTION
-    CPACK_ADDGRP_STR)
+    CPACK_COMPONENT_GROUP_${_CPACK_ADDGRP_UNAME}_DESCRIPTION
+    _CPACK_ADDGRP_STR)
   cpack_append_string_variable_set_command(
-    CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}_PARENT_GROUP
-    CPACK_ADDGRP_STR)
+    CPACK_COMPONENT_GROUP_${_CPACK_ADDGRP_UNAME}_PARENT_GROUP
+    _CPACK_ADDGRP_STR)
   cpack_append_option_set_command(
-    CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}_EXPANDED
-    CPACK_ADDGRP_STR)
+    CPACK_COMPONENT_GROUP_${_CPACK_ADDGRP_UNAME}_EXPANDED
+    _CPACK_ADDGRP_STR)
   cpack_append_option_set_command(
-    CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}_BOLD_TITLE
-    CPACK_ADDGRP_STR)
+    CPACK_COMPONENT_GROUP_${_CPACK_ADDGRP_UNAME}_BOLD_TITLE
+    _CPACK_ADDGRP_STR)
   # Backward compatibility issue.
   # Write to config iff the macros is used after CPack.cmake has been
   # included, other it's not necessary because the variables
   # will be encoded by cpack_encode_variables.
   if(CPack_CMake_INCLUDED)
-    file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${CPACK_ADDGRP_STR}")
+    file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${_CPACK_ADDGRP_STR}")
   endif()
 endmacro()
 
 # Macro that adds an installation type to the CPack installer
 macro(cpack_add_install_type insttype)
-  string(TOUPPER ${insttype} CPACK_INSTTYPE_UNAME)
-  cpack_parse_arguments(CPACK_INSTALL_TYPE_${CPACK_INSTTYPE_UNAME}
+  string(TOUPPER ${insttype} _CPACK_INSTTYPE_UNAME)
+  cpack_parse_arguments(CPACK_INSTALL_TYPE_${_CPACK_INSTTYPE_UNAME}
     "DISPLAY_NAME"
     ""
     ${ARGN}
     )
 
-  set(CPACK_INSTTYPE_STR
+  set(_CPACK_INSTTYPE_STR
     "\n# Configuration for installation type \"${insttype}\"\n")
-  set(CPACK_INSTTYPE_STR
-    "${CPACK_INSTTYPE_STR}list(APPEND CPACK_ALL_INSTALL_TYPES ${insttype})\n")
+  set(_CPACK_INSTTYPE_STR
+    "${_CPACK_INSTTYPE_STR}list(APPEND CPACK_ALL_INSTALL_TYPES ${insttype})\n")
   cpack_append_string_variable_set_command(
-    CPACK_INSTALL_TYPE_${CPACK_INSTTYPE_UNAME}_DISPLAY_NAME
-    CPACK_INSTTYPE_STR)
+    CPACK_INSTALL_TYPE_${_CPACK_INSTTYPE_UNAME}_DISPLAY_NAME
+    _CPACK_INSTTYPE_STR)
   # Backward compatibility issue.
   # Write to config iff the macros is used after CPack.cmake has been
   # included, other it's not necessary because the variables
   # will be encoded by cpack_encode_variables.
   if(CPack_CMake_INCLUDED)
-    file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${CPACK_INSTTYPE_STR}")
+    file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" "${_CPACK_INSTTYPE_STR}")
   endif()
 endmacro()
 

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

Summary of changes:
 Modules/CPackComponent.cmake |   44 +++++++++++++++++++++---------------------
 Source/CMakeVersion.cmake    |    2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
CMake