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 71f7b678666f1e91b56972df9a9871816584af67 (commit) via 0ffd35340e5458882b4b9596a84dd7cdfeaecfbd (commit) via a3e2de3a312aa7db516a9127a96dd1d966a7fa47 (commit) from bda82241db4eb8d23661d3ce95de0b011d4b40d3 (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71f7b678666f1e91b56972df9a9871816584af67 commit 71f7b678666f1e91b56972df9a9871816584af67 Merge: bda8224 0ffd353 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sun Apr 5 16:53:13 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Apr 5 16:53:13 2015 -0400 Merge topic 'cpack-one-component-only' into next 0ffd3534 CPack single component packaging a3e2de3a CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ffd35340e5458882b4b9596a84dd7cdfeaecfbd commit 0ffd35340e5458882b4b9596a84dd7cdfeaecfbd Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sun Apr 5 22:49:19 2015 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sun Apr 5 22:49:41 2015 +0200 CPack single component packaging RPM, DEB and archive packages were not created in cases when CPACK_<generator>_COMPONENT_INSTALL was set to ON and a single component existed. Patch also changes CPackRPM test to implicitly test for this case. diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 67005ef..995eb0d 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -1499,7 +1499,10 @@ bool cmCPackGenerator::SupportsComponentInstallation() const //---------------------------------------------------------------------- bool cmCPackGenerator::WantsComponentInstallation() const { - return (!IsOn("CPACK_MONOLITHIC_INSTALL") & SupportsComponentInstallation()); + return (!IsOn("CPACK_MONOLITHIC_INSTALL") + && SupportsComponentInstallation() + // check that package at least has components + && !(this->ComponentGroups.empty() || this->Components.empty())); } //---------------------------------------------------------------------- diff --git a/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake b/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake index 3ace6a8..31e729b 100644 --- a/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake +++ b/Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake @@ -1,5 +1,4 @@ install(FILES CMakeLists.txt DESTINATION /not_relocatable COMPONENT static) -install(FILES CMakeLists.txt DESTINATION relocatable COMPONENT relocatable) set(CPACK_PACKAGE_RELOCATABLE TRUE) set(CPACK_PACKAGING_INSTALL_PREFIX "/opt") ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/CPack/cmCPackGenerator.cxx | 5 ++++- .../CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits