[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-605-gdd8f935

Kitware Robot kwrobot at kitware.com
Thu Mar 23 13:55:02 EDT 2017


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  dd8f9350e498f92c094593d8f87db419372ebdea (commit)
       via  8dc23a438065b711b7b60b17c982f34a96631d1a (commit)
      from  08b2a3a2ca83d8249b433708b7bb6982d04d7bb4 (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=dd8f9350e498f92c094593d8f87db419372ebdea
commit dd8f9350e498f92c094593d8f87db419372ebdea
Merge: 08b2a3a 8dc23a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 23 17:49:57 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Mar 23 13:50:02 2017 -0400

    Stage topic 'correct-error-message-debug-lengths'
    
    Topic-id: 23211
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/614


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dc23a438065b711b7b60b17c982f34a96631d1a
commit 8dc23a438065b711b7b60b17c982f34a96631d1a
Author:     Daniel Black <grooverdan at users.sourceforge.net>
AuthorDate: Thu Mar 23 23:57:17 2017 +1100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 23 13:47:58 2017 -0400

    CPack/RPM: fix error message associated with source path length

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 722ee15..1519e29 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1472,8 +1472,8 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
           string(LENGTH "${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}" debuginfo_dir_len)
           if(source_dir_len_ LESS debuginfo_dir_len)
             message(FATAL_ERROR "CPackRPM: source dir path '${source_dir_}' is"
-              " longer than debuginfo sources dir path '${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}'!"
-              " Source dir path must be shorter than debuginfo sources dir path."
+              " shorter than debuginfo sources dir path '${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}'!"
+              " Source dir path must be longer than debuginfo sources dir path."
               " Set CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX variable to a shorter value"
               " or make source dir path longer."
               " Required for debuginfo packaging. See documentation of"

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list