[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-640-gb572311

[Rolf Eike Beer]

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  b5723112b788aa93d9af9170a3795d0efdf2d514 (commit)
       via  5cc8169bf9c0d04d74fb82e3bcb586095635fba1 (commit)
      from  eb695ff8a578bca4f114fe9bf9660595863cc737 (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=b5723112b788aa93d9af9170a3795d0efdf2d514
commit b5723112b788aa93d9af9170a3795d0efdf2d514
Merge: eb695ff 5cc8169
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 14 12:06:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 14 12:06:09 2014 -0500

    Merge topic 'CPackRPM_SUBSTRING_-1' into next
    
    5cc8169b CPackRPM: remove unneeded string length calculation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cc8169bf9c0d04d74fb82e3bcb586095635fba1
commit 5cc8169bf9c0d04d74fb82e3bcb586095635fba1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 14 18:01:10 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Nov 14 18:01:10 2014 +0100

    CPackRPM: remove unneeded string length calculation
    
    This wants just the rest of the string, which can be achieved by passing -1 as
    remainder length.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 56d9b66..66717ef 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -683,9 +683,7 @@ foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLIC
     # Transform NAME --> Name e.g. PROVIDES --> Provides
     # The Upper-case first letter and lowercase tail is the
     # appropriate value required in the final RPM spec file.
-    string(LENGTH ${_RPM_SPEC_HEADER} _PACKAGE_HEADER_STRLENGTH)
-    math(EXPR _PACKAGE_HEADER_STRLENGTH "${_PACKAGE_HEADER_STRLENGTH} - 1")
-    string(SUBSTRING ${_RPM_SPEC_HEADER} 1 ${_PACKAGE_HEADER_STRLENGTH} _PACKAGE_HEADER_TAIL)
+    string(SUBSTRING ${_RPM_SPEC_HEADER} 1 -1 _PACKAGE_HEADER_TAIL)
     string(TOLOWER "${_PACKAGE_HEADER_TAIL}" _PACKAGE_HEADER_TAIL)
     string(SUBSTRING ${_RPM_SPEC_HEADER} 0 1 _PACKAGE_HEADER_NAME)
     set(_PACKAGE_HEADER_NAME "${_PACKAGE_HEADER_NAME}${_PACKAGE_HEADER_TAIL}")

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

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


hooks/post-receive
-- 
CMake