mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-14 10:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: CPack/DEB test change prerequirements check

Browse Source 
Prerequirements should be searched for in
generator prerequirements function and only
checked for presence in configure file in
per test prerequirements function.
This commit is contained in:
Domen Vrankar
2016-11-27 20:35:13 +01:00
parent 48456535f3
commit a8a4709808
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/CPack/DEB/Helpers.cmake
View File

@@ -84,8 +84,6 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR)
string(APPEND error_extra "; errors \"${deb_install_files_errors}\"")
endif()
find_program(READELF_EXECUTABLE NAMES readelf)
if(READELF_EXECUTABLE)
string(APPEND error_extra "; readelf \"\n")

7
Tests/RunCMake/CPack/DEB/Prerequirements.cmake
View File

@@ -12,4 +12,11 @@ function(get_test_prerequirements found_var config_file)
file(APPEND "${config_file}"
"\nset(FAKEROOT_EXECUTABLE \"${FAKEROOT_EXECUTABLE}\")")
endif()
# optional tool for some tests
find_program(READELF_EXECUTABLE NAMES readelf)
if(READELF_EXECUTABLE)
file(APPEND "${config_file}"
"\nset(READELF_EXECUTABLE \"${READELF_EXECUTABLE}\")")
endif()
endfunction()

4
Tests/RunCMake/CPack/tests/GENERATE_SHLIBS/DEB-Prerequirements.cmake
View File

@@ -1,5 +1,5 @@
function(get_test_prerequirements found_var)
find_program(READELF_EXECUTABLE NAMES readelf)
function(get_test_prerequirements found_var config_file)
include(${config_file})
if(READELF_EXECUTABLE)
set(${found_var} true PARENT_SCOPE)

4
Tests/RunCMake/CPack/tests/GENERATE_SHLIBS_LDCONFIG/DEB-Prerequirements.cmake
View File

@@ -1,5 +1,5 @@
function(get_test_prerequirements found_var)
find_program(READELF_EXECUTABLE NAMES readelf)
function(get_test_prerequirements found_var config_file)
include(${config_file})
if(READELF_EXECUTABLE)
set(${found_var} true PARENT_SCOPE)