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 71fa3a0c2418e3caed26aed3a31bde206c6d7132 (commit) via a54292903ef9814390fcd4f938a890644d80d231 (commit) via 1c06f207b1bfac76e7976754971fd94533214461 (commit) from d33d03fc10466eac6bbbd11fc293604545977ebb (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=71fa3a0c2418e3caed26aed3a31bde206c6d7132 commit 71fa3a0c2418e3caed26aed3a31bde206c6d7132 Merge: d33d03f a542929 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri May 13 10:00:00 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri May 13 10:00:00 2016 -0400 Merge topic 'cpack-deb-improvements' into next a5429290 fixup! CPack/Deb proper package file naming 1c06f207 fixup! CPack/Deb generation of DEBIAN/shlibs control file https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a54292903ef9814390fcd4f938a890644d80d231 commit a54292903ef9814390fcd4f938a890644d80d231 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri May 13 15:52:20 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Fri May 13 15:52:20 2016 +0200 fixup! CPack/Deb proper package file naming Don't set an unneeded variable that can cause problems with package generation (found with CPack/RPM symlink test while porting). diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 24e06fe..aec06b7 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -205,11 +205,15 @@ int cmCPackDebGenerator::PackageComponentsAllInOne( /* replace the TEMPORARY package file name */ this->SetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME", packageFileName.c_str()); - // Tell CPackDeb.cmake the path where the component is. - std::string component_path = "/"; - component_path += compInstDirName; - this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH", - component_path.c_str()); + + if(!compInstDirName.empty()) + { + // Tell CPackDeb.cmake the path where the component is. + std::string component_path = "/"; + component_path += compInstDirName; + this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH", + component_path.c_str()); + } if (!this->ReadListFile("CPackDeb.cmake")) { cmCPackLogger(cmCPackLog::LOG_ERROR, https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c06f207b1bfac76e7976754971fd94533214461 commit 1c06f207b1bfac76e7976754971fd94533214461 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Fri May 13 15:35:57 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Fri May 13 15:35:57 2016 +0200 fixup! CPack/Deb generation of DEBIAN/shlibs control file Loosen up the regex to correctly parse data from strings with Asian characters diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 0711238..d93d924 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -487,7 +487,7 @@ function(extract_so_info shared_object libname version) ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) if(result EQUAL 0) - string(REGEX MATCH "\\(SONAME\\) [^\n]*: \\[([^\n]+)\\.so\\.([^\n]*)\\]\n" soname "${output}") + string(REGEX MATCH "\\(SONAME\\)[^\n]*\\[([^\n]+)\\.so\\.([^\n]*)\\]" soname "${output}") set(${libname} "${CMAKE_MATCH_1}" PARENT_SCOPE) set(${version} "${CMAKE_MATCH_2}" PARENT_SCOPE) else() ----------------------------------------------------------------------- Summary of changes: Modules/CPackDeb.cmake | 2 +- Source/CPack/cmCPackDebGenerator.cxx | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits