summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/CPack
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-21 12:19:50 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-09-21 12:19:52 (GMT)
commit5737bb37562007b571cd6b4f94bf4d2f2f038136 (patch)
treeb5e0867c954cbda59cc31753c5f4fcc612296624 /Tests/RunCMake/CPack
parent5c5b28dd9ddd47db89a09905542597f88d200d67 (diff)
parentb06870e5ff03da40ac265b8ba3bd84d5223bcf6b (diff)
downloadCMake-5737bb37562007b571cd6b4f94bf4d2f2f038136.zip
CMake-5737bb37562007b571cd6b4f94bf4d2f2f038136.tar.gz
CMake-5737bb37562007b571cd6b4f94bf4d2f2f038136.tar.bz2
Merge topic 'cpack-different-checksum-file-per-generator'
b06870e5 CPack: use a distinct checksum file for each generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1291
Diffstat (limited to 'Tests/RunCMake/CPack')
-rw-r--r--Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/VerifyResult.cmake5
1 files changed, 2 insertions, 3 deletions
diff --git a/Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/VerifyResult.cmake
index e4f9618..2bb4d3f 100644
--- a/Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/VerifyResult.cmake
@@ -1,8 +1,7 @@
if(NOT ${RunCMake_SUBTEST_SUFFIX} MATCHES "invalid")
- string(TOLOWER ${RunCMake_SUBTEST_SUFFIX} EXTENSION)
+ string(TOLOWER ${RunCMake_SUBTEST_SUFFIX} CHECKSUM_EXTENSION)
file(GLOB PACKAGE RELATIVE ${bin_dir} "*.tar.gz")
- file(GLOB CSUMFILE RELATIVE ${bin_dir} "*.${EXTENSION}")
- file(STRINGS ${CSUMFILE} CHSUM_VALUE)
+ file(STRINGS ${PACKAGE}.${CHECKSUM_EXTENSION} CHSUM_VALUE)
file(${RunCMake_SUBTEST_SUFFIX} ${PACKAGE} expected_value )
set(expected_value "${expected_value} ${PACKAGE}")