[Cmake-commits] CMake branch, next, updated. v3.6.2-2493-g6330c8f

[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  6330c8f70b69e8aac2d05846ad509d9972df2090 (commit)
       via  d068b65db17fa6a07970e6640cb69e265746d1ae (commit)
      from  afe788b028034d796f0fc121eee557930fa73e75 (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=6330c8f70b69e8aac2d05846ad509d9972df2090
commit 6330c8f70b69e8aac2d05846ad509d9972df2090
Merge: afe788b d068b65
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Sep 26 11:00:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 26 11:00:53 2016 -0400

    Merge topic 'cpack-rpm-debuginfo-sources' into next
    
    d068b65d fixup! CPack/RPM debuginfo packages must contain sources


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d068b65db17fa6a07970e6640cb69e265746d1ae
commit d068b65db17fa6a07970e6640cb69e265746d1ae
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Sep 26 16:59:56 2016 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon Sep 26 16:59:56 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..d98b682 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 "-Wl,--build-id")
+  string(APPEND CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id")
+endif()
+
 set(CPACK_RPM_COMPONENT_INSTALL "ON")
 
 set(CMAKE_BUILD_TYPE Debug)
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
deleted file mode 100644
index fea8db5..0000000
--- a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-function(get_test_prerequirements found_var)
-  # for now PGI compiler is not supported as it doesn't set --build-id
-  # required by debuginfo rpm packages
-
-  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
-    set(${found_var} true PARENT_SCOPE)
-  endif()
-endfunction()

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

Summary of changes:
 Tests/RunCMake/CPack/DEBUGINFO.cmake                     |    6 ++++++
 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake |    8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake


hooks/post-receive
-- 
CMake