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 172a21790ba117af6a03e35c69213a89a5cb86f3 (commit) via ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc (commit) from b142dcad64a324b652929f426e2ac59a32dde0c8 (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=172a21790ba117af6a03e35c69213a89a5cb86f3 commit 172a21790ba117af6a03e35c69213a89a5cb86f3 Merge: b142dca ceafbeb Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Thu Jun 11 17:49:48 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jun 11 17:49:48 2015 -0400 Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next ceafbeb1 fixup! CPack Deb and RPM RunCMake tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc commit ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Thu Jun 11 23:38:13 2015 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Thu Jun 11 23:38:13 2015 +0200 fixup! CPack Deb and RPM RunCMake tests Test if there is also RPMBUILD available and also print out test config file content if something goes wrong. diff --git a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake index 69375e2..3416205 100644 --- a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake +++ b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake @@ -5,9 +5,12 @@ function(get_test_prerequirements found_var config_file) endif() find_program(RPM_EXECUTABLE rpm) + find_program(RPMBUILD_EXECUTABLE rpmbuild) - if(RPM_EXECUTABLE) + if(RPM_EXECUTABLE AND RPMBUILD_EXECUTABLE) file(WRITE "${config_file}" "set(RPM_EXECUTABLE \"${RPM_EXECUTABLE}\")") + file(APPEND "${config_file}" + "\nset(RPMBUILD_EXECUTABLE \"${RPMBUILD_EXECUTABLE}\")") set(${found_var} true PARENT_SCOPE) endif() endfunction() diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index c89bfae..809011b 100644 --- a/Tests/RunCMake/CPack/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/VerifyResult.cmake @@ -5,8 +5,10 @@ include("${src_dir}/${GENERATOR_TYPE}/Helpers.cmake") file(READ "${bin_dir}/test_output.txt" output) file(READ "${bin_dir}/test_error.txt" error) +file(READ "${config_file}" config_file_content) -set(output_error_message "\nCPack output: '${output}'\nCPack error: '${error}'") +set(output_error_message + "\nCPack output: '${output}'\nCPack error: '${error}';\nconfig file: '${config_file_content}'") # check that expected generated files exist and contain expected content include("${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-ExpectedFiles.cmake") ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/CPack/RPM/Prerequirements.cmake | 5 ++++- Tests/RunCMake/CPack/VerifyResult.cmake | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits