[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-711-g469b250

[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  469b2503bd0c57820542f6a23df58b00252de7b9 (commit)
       via  51a60973eb67b33e857473f2fe98ae25943f7648 (commit)
      from  4d0bc3222cf91c647a3d9f00e370a9ed1156778e (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=469b2503bd0c57820542f6a23df58b00252de7b9
commit 469b2503bd0c57820542f6a23df58b00252de7b9
Merge: 4d0bc32 51a6097
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 18 09:25:53 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 18 09:25:53 2014 -0500

    Merge topic 'CPackRPM-cleanup-component-vars' into next
    
    51a60973 CPackRPM: Unset temporary component variables before re-use


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51a60973eb67b33e857473f2fe98ae25943f7648
commit 51a60973eb67b33e857473f2fe98ae25943f7648
Author:     Gauthier Lamaison <gauthier.lamaison at gmail.com>
AuthorDate: Mon Nov 17 20:29:29 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 18 09:25:10 2014 -0500

    CPackRPM: Unset temporary component variables before re-use
    
    Improve the fix from commit v2.8.9~136^2 (CPackRPM: avoid leakage of RPM
    directive from one component to another, 2012-06-05) to clean up more
    temporary variables.
    
    Reviewed-by: Domen Vrankar <domen.vrankar at gmail.com>

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 66717ef..d2cb2ee 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -678,6 +678,8 @@ foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLIC
         endif()
     endif()
 
+  # Do not forget to unset previously set header (from previous component)
+  unset(TMP_RPM_${_RPM_SPEC_HEADER})
   # Treat the RPM Spec keyword iff it has been properly defined
   if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
     # Transform NAME --> Name e.g. PROVIDES --> Provides
@@ -698,9 +700,7 @@ foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLIC
       message("CPackRPM:Debug: User defined ${_PACKAGE_HEADER_NAME}:\n ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}")
     endif()
     set(TMP_RPM_${_RPM_SPEC_HEADER} "${_PACKAGE_HEADER_NAME}: ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}")
-  else()
-    # Do not forget to unset previously set header (from previous component)
-    unset(TMP_RPM_${_RPM_SPEC_HEADER})
+    unset(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
   endif()
 endforeach()
 

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

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


hooks/post-receive
-- 
CMake