diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2018-06-11 19:33:23 (GMT) |
---|---|---|
committer | Kyle Edwards <kyle.edwards@kitware.com> | 2018-07-02 13:51:02 (GMT) |
commit | 2ef966bc77e9efd036747ee9d6977e2f2c7e024d (patch) | |
tree | 3823d55e5706dfee4aa903766956df4246b8de97 /Tests/RunCMake/CPack/VerifyResult.cmake | |
parent | 80914d88da3e5c997158fd3cc703a39b6673f780 (diff) | |
download | CMake-2ef966bc77e9efd036747ee9d6977e2f2c7e024d.zip CMake-2ef966bc77e9efd036747ee9d6977e2f2c7e024d.tar.gz CMake-2ef966bc77e9efd036747ee9d6977e2f2c7e024d.tar.bz2 |
Testing: Add test for CPack External generator
This test case ensures that the CPack External generator produces
the proper .json file, and also ensures that the version negotation
with CPACK_EXT_REQUESTED_VERSIONS works properly.
Diffstat (limited to 'Tests/RunCMake/CPack/VerifyResult.cmake')
-rw-r--r-- | Tests/RunCMake/CPack/VerifyResult.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index 1f5ab87..af12d37 100644 --- a/Tests/RunCMake/CPack/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/VerifyResult.cmake @@ -56,8 +56,12 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0) set(EXPECTED_FILE_CONTENT_${file_no_} "${EXPECTED_FILE_CONTENT_${file_no_}_LIST}") toExpectedContentList("${file_no_}" "EXPECTED_FILE_CONTENT_${file_no_}") - list(SORT PACKAGE_CONTENT) - list(SORT EXPECTED_FILE_CONTENT_${file_no_}) + if(NOT PACKAGE_CONTENT STREQUAL "") + list(SORT PACKAGE_CONTENT) + endif() + if(NOT EXPECTED_FILE_CONTENT_${file_no_} STREQUAL "") + list(SORT EXPECTED_FILE_CONTENT_${file_no_}) + endif() if(PACKAGE_CONTENT STREQUAL EXPECTED_FILE_CONTENT_${file_no_}) set(expected_content_list TRUE) |