summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-17 14:40:45 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-11-17 14:40:45 (GMT)
commitba007d3f07acb18f41d48575ca0b8700cd4a6e8e (patch)
treeab2fce2a8782b5af402a4d9186cadff1d981860b
parent545d10cc6793555ab881d27207e4ae378f3caade (diff)
parent5cc8169bf9c0d04d74fb82e3bcb586095635fba1 (diff)
downloadCMake-ba007d3f07acb18f41d48575ca0b8700cd4a6e8e.zip
CMake-ba007d3f07acb18f41d48575ca0b8700cd4a6e8e.tar.gz
CMake-ba007d3f07acb18f41d48575ca0b8700cd4a6e8e.tar.bz2
Merge topic 'CPackRPM_SUBSTRING_-1'
5cc8169b CPackRPM: remove unneeded string length calculation
-rw-r--r--Modules/CPackRPM.cmake4
1 files changed, 1 insertions, 3 deletions
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}")