[Cmake-commits] CMake branch, next, updated. v3.6.2-2446-g6294b8b

[Domen Vrankar]

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  6294b8bf002dfc7e2ae4edb671c3a87c8affae80 (commit)
       via  784abda5e5995c4e29c6ded3d3f72619d3510a14 (commit)
       via  afb7f17e888484cdd3db4e16c7a473a557fbe53a (commit)
       via  b4b740b6003f25d36799af6de429151c65f7b49b (commit)
      from  9041fb2470a9df8ce922bb0c8e591e99b98fd5fd (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=6294b8bf002dfc7e2ae4edb671c3a87c8affae80
commit 6294b8bf002dfc7e2ae4edb671c3a87c8affae80
Merge: 9041fb2 784abda
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Sep 24 05:57:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 24 05:57:11 2016 -0400

    Merge topic 'cpack-rpm-debuginfo-sources' into next
    
    784abda5 fixup! CPack/RPM debuginfo packaging documentation
    afb7f17e fixup! CPack/RPM debuginfo packages must contain sources
    b4b740b6 fixup! CPack/RPM debuginfo packages must contain sources


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=784abda5e5995c4e29c6ded3d3f72619d3510a14
commit 784abda5e5995c4e29c6ded3d3f72619d3510a14
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Sep 24 11:01:11 2016 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Sep 24 11:56:13 2016 +0200

    fixup! CPack/RPM debuginfo packaging documentation

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 8e4aeaf..9ed60d3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -752,11 +752,13 @@
 #  :variable:`CPACK_BUILD_SOURCE_DIRS` will not be present in debuginfo package.
 #
 # .. variable:: CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
+#               CPACK_RPM_<component>_BUILD_SOURCE_DIRS_PREFIX
 #
 #  Prefix of location where sources will be placed during package installation.
 #
 #  * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
-#  * Default   : "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}"
+#  * Default   : "/usr/src/debug/<CPACK_PACKAGE_FILE_NAME>" and
+#                for component packaging "/usr/src/debug/<CPACK_PACKAGE_FILE_NAME>-<component>"
 #
 # .. note::
 #

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afb7f17e888484cdd3db4e16c7a473a557fbe53a
commit afb7f17e888484cdd3db4e16c7a473a557fbe53a
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Sep 24 10:26:59 2016 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Sep 24 11:56:08 2016 +0200

    fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d880b24..8e4aeaf 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2056,8 +2056,12 @@ function(cpack_rpm_generate_package)
     "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DEBUGINFO_PACKAGE"
     "CPACK_RPM_DEBUGINFO_PACKAGE")
   if(CPACK_RPM_DEBUGINFO_PACKAGE)
+    cpack_rpm_variable_fallback("CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX"
+      "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_BUILD_SOURCE_DIRS_PREFIX"
+      "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_BUILD_SOURCE_DIRS_PREFIX"
+      "CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX")
     if(NOT CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX)
-      set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}")
+      set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}")
     endif()
     cpack_rpm_debugsymbol_check("${CPACK_RPM_INSTALL_FILES}" "${WDIR}")
 
@@ -2373,7 +2377,7 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
     execute_process(
       COMMAND "${RPMBUILD_EXECUTABLE}" ${RPMBUILD_FLAGS}
               --define "_topdir ${CPACK_RPM_DIRECTORY}"
-              --buildroot "%_topdir/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}" # TODO should I remove this variable? or change the path?
+              --buildroot "%_topdir/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
               --target "${CPACK_RPM_PACKAGE_ARCHITECTURE}"
               "${CPACK_RPM_BINARY_SPECFILE}"
       WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4b740b6003f25d36799af6de429151c65f7b49b
commit b4b740b6003f25d36799af6de429151c65f7b49b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Sep 24 10:09:15 2016 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Sep 24 11:56:01 2016 +0200

    fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake b/Tests/RunCMake/CPack/DEBUGINFO.cmake
index ead7ad1..e8d1c85 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,5 +1,11 @@
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
+# PGI compiler doesn't add build id to binaries by default
+if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS "--build-id")
+  string(APPEND CMAKE_SHARED_LINKER_FLAGS "--build-id")
+endif()
+
 set(CPACK_RPM_COMPONENT_INSTALL "ON")
 
 set(CMAKE_BUILD_TYPE Debug)

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

Summary of changes:
 Modules/CPackRPM.cmake               |   12 +++++++++---
 Tests/RunCMake/CPack/DEBUGINFO.cmake |    6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake