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 e4d782024d3c654c216bbd32d6ad80f43dde5c29 (commit)
via 3c63947c9d645a7b9763b116610cc2c58024f5ab (commit)
from d1bc55fd7228dd433eb457ec2d2dd38721694151 (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=e4d782024d3c654c216bbd32d6ad80f43dde5c29
commit e4d782024d3c654c216bbd32d6ad80f43dde5c29
Merge: d1bc55f 3c63947
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 25 17:55:29 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 25 17:55:29 2016 -0400
Merge topic 'cpack-rpm-debuginfo-sources' into next
3c63947c fixup! CPack/RPM debuginfo packages must contain sources
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c63947c9d645a7b9763b116610cc2c58024f5ab
commit 3c63947c9d645a7b9763b116610cc2c58024f5ab
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Sun Sep 25 23:54:53 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Sun Sep 25 23:54:53 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 e8d1c85..ead7ad1 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,11 +1,5 @@
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)
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
new file mode 100644
index 0000000..fea8db5
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
@@ -0,0 +1,8 @@
+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, 8 insertions(+), 6 deletions(-)
create mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
