[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-617-g47ea9a8
Kitware Robot
kwrobot at kitware.com
Thu Mar 23 20:25:08 EDT 2017
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 47ea9a8f3927ad605729400e812ca52560f9265f (commit)
via 794c3b65826300b99548227a1f618ff2097cceb1 (commit)
via d268dc1e62ca9e4971672d89c536b56eb98f8ab5 (commit)
from 2b1a2307f2e37686a2f2cdc4a52104fa04c48ccc (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=47ea9a8f3927ad605729400e812ca52560f9265f
commit 47ea9a8f3927ad605729400e812ca52560f9265f
Merge: 2b1a230 794c3b6
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Mar 24 00:17:28 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Mar 23 20:17:32 2017 -0400
Stage topic 'cpack-rpm-debuginfo-honor-package-filename'
Topic-id: 23243
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/620
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=794c3b65826300b99548227a1f618ff2097cceb1
commit 794c3b65826300b99548227a1f618ff2097cceb1
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Mar 23 23:41:20 2017 +0100
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Mar 24 01:07:10 2017 +0100
CPack/RPM honor package file name on debuginfo enabled
Packages with debuginfo enabled should
still honor defined package file name
if file name is not set to RPM-DEFAULT.
Fixes #16715
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 2e69195..a81719e 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2648,8 +2648,8 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
unset(expected_filenames_)
unset(filenames_)
if(CPACK_RPM_DEBUGINFO_PACKAGE AND NOT CPACK_RPM_FILE_NAME STREQUAL "RPM-DEFAULT")
- string(TOLOWER "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.*\\.rpm" efn_)
- list(APPEND expected_filenames_ "${efn_}")
+ list(APPEND expected_filenames_
+ "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.*\\.rpm")
list(APPEND filenames_ "${CPACK_RPM_FILE_NAME}")
endif()
diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
index 06e56d3..452c1de 100644
--- a/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
+++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake
@@ -3,11 +3,13 @@ set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "5")
set(EXPECTED_FILES_NAME_GENERATOR_SPECIFIC_FORMAT TRUE)
+set(PACKAGES_FILE_NAME "Debuginfo")
+
set(EXPECTED_FILE_1_COMPONENT "applications")
set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/test_prog")
-set(EXPECTED_FILE_2 "debuginfo*-headers.rpm")
+set(EXPECTED_FILE_2 "TestDinfo-pkg*-headers.rpm")
set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
-set(EXPECTED_FILE_3 "debuginfo*-libs.rpm")
+set(EXPECTED_FILE_3 "TestDinfo-pkg*-libs.rpm")
set(EXPECTED_FILE_CONTENT_3_LIST "/usr;/usr/bas;/usr/bas/libtest_lib.so")
set(EXPECTED_FILE_4_COMPONENT "applications-debuginfo")
diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
index 0642d83..cfae259 100644
--- a/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
+++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
@@ -25,6 +25,11 @@ install(TARGETS test_lib DESTINATION bas COMPONENT libs)
set(CPACK_RPM_APPLICATIONS_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_APPLICATIONS_DEBUGINFO_PACKAGE ON)
+
+# test that components with debuginfo enabled still honor
+# CPACK_PACKAGE_FILE_NAME setting
+set(CPACK_RPM_PACKAGE_NAME "Debuginfo")
+set(CPACK_PACKAGE_FILE_NAME "TestDinfo-pkg")
set(CPACK_RPM_LIBS_DEBUGINFO_PACKAGE ON)
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/src")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d268dc1e62ca9e4971672d89c536b56eb98f8ab5
commit d268dc1e62ca9e4971672d89c536b56eb98f8ab5
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Mar 23 23:36:47 2017 +0100
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Mar 24 00:11:04 2017 +0100
CPack support test packages name override
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index 7c98f69..428a25e 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -131,8 +131,8 @@ this step and must contain
parts that are already populated by default but can always be
overwritten if needed:
- EXPECTED_FILE_<file_number_starting_with_1>_NAME is the name component of
- the file (by default it is set to package name that is same as test name
- in lowercase)
+ the file (by default it is set to PACKAGES_FILE_NAME or if not set to
+ package name that is same as test name in lowercase)
- EXPECTED_FILE_<file_number_starting_with_1>_VERSION is the version of the
package (by default it is set to '0.1.1')
- EXPECTED_FILE_<file_number_starting_with_1>_REVISION is the revision of the
diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake
index 59751a7..cefeb9a 100644
--- a/Tests/RunCMake/CPack/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/VerifyResult.cmake
@@ -1,10 +1,14 @@
cmake_minimum_required(VERSION ${CMAKE_VERSION} FATAL_ERROR)
-function(findExpectedFile FILE_NO RESULT_VAR)
+function(findExpectedFile FILE_NO RESULT_VAR EXPECTED_FILE_REGEX_VAR)
if(NOT DEFINED EXPECTED_FILE_${FILE_NO}) # explicit file name regex was not provided - construct one from other data
# set defaults if parameters are not provided
if(NOT DEFINED EXPECTED_FILE_${FILE_NO}_NAME)
- string(TOLOWER "${RunCMake_TEST_FILE_PREFIX}" EXPECTED_FILE_${FILE_NO}_NAME)
+ if(PACKAGES_FILE_NAME)
+ set(EXPECTED_FILE_${FILE_NO}_NAME "${PACKAGES_FILE_NAME}")
+ else()
+ string(TOLOWER "${RunCMake_TEST_FILE_PREFIX}" EXPECTED_FILE_${FILE_NO}_NAME)
+ endif()
endif()
if(NOT DEFINED EXPECTED_FILE_${FILE_NO}_VERSION)
set(EXPECTED_FILE_${FILE_NO}_VERSION "0.1.1")
@@ -21,6 +25,7 @@ function(findExpectedFile FILE_NO RESULT_VAR)
file(GLOB found_file_ RELATIVE "${bin_dir}" "${EXPECTED_FILE_${FILE_NO}}")
set(${RESULT_VAR} "${found_file_}" PARENT_SCOPE)
+ set(${EXPECTED_FILE_REGEX_VAR} "${EXPECTED_FILE_${FILE_NO}}" PARENT_SCOPE)
endfunction()
include("${config_file}")
@@ -39,7 +44,8 @@ include("${src_dir}/tests/${RunCMake_TEST_FILE_PREFIX}/ExpectedFiles.cmake")
# check that expected generated files exist and contain expected content
if(NOT EXPECTED_FILES_COUNT EQUAL 0)
foreach(file_no_ RANGE 1 ${EXPECTED_FILES_COUNT})
- findExpectedFile("${file_no_}" "FOUND_FILE_${file_no_}")
+ findExpectedFile("${file_no_}" "FOUND_FILE_${file_no_}"
+ "EXPECTED_FILE_${file_no_}")
list(APPEND foundFiles_ "${FOUND_FILE_${file_no_}}")
list(LENGTH FOUND_FILE_${file_no_} foundFilesCount_)
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackRPM.cmake | 4 ++--
Tests/RunCMake/CPack/README.txt | 4 ++--
Tests/RunCMake/CPack/VerifyResult.cmake | 12 +++++++++---
Tests/RunCMake/CPack/tests/DEBUGINFO/ExpectedFiles.cmake | 6 ++++--
Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake | 5 +++++
5 files changed, 22 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list