kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPackRPM add more trace output in order to help failing diagnostics

This commit is contained in:
Eric NOULARD 2011-03-10 09:48:46 +01:00
parent 8def3f5949
commit 564b7311f4
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/CPackRPM.cmake
View File

@ -194,6 +194,25 @@ IF(NOT RPMBUILD_EXECUTABLE)
MESSAGE(FATAL_ERROR "RPM package requires rpmbuild executable") MESSAGE(FATAL_ERROR "RPM package requires rpmbuild executable")
ENDIF(NOT RPMBUILD_EXECUTABLE) ENDIF(NOT RPMBUILD_EXECUTABLE)
# Display lsb_release output if DEBUG mode enable
# This will help to diagnose problem with CPackRPM
# because we will know on which kind of Linux we are
IF(CPACK_RPM_PACKAGE_DEBUG)
find_program(LSB_RELEASE_EXECUTABLE lsb_release)
if(LSB_RELEASE_EXECUTABLE)
execute_process(COMMAND ${LSB_RELEASE_EXECUTABLE} -a
OUTPUT_VARIABLE _TMP_LSB_RELEASE_OUTPUT
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX REPLACE "\n" ", "
LSB_RELEASE_OUTPUT
${_TMP_LSB_RELEASE_OUTPUT})
else (LSB_RELEASE_EXECUTABLE)
set(LSB_RELEASE_OUTPUT "lsb_release not installed/found!")
endif(LSB_RELEASE_EXECUTABLE)
MESSAGE("CPackRPM:Debug: LSB_RELEASE = ${LSB_RELEASE_OUTPUT}")
ENDIF(CPACK_RPM_PACKAGE_DEBUG)
# We may use RPM version in the future in order # We may use RPM version in the future in order
# to shut down warning about space in buildtree # to shut down warning about space in buildtree
# some recent RPM version should support space in different places. # some recent RPM version should support space in different places.

9
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
View File

@ -30,8 +30,8 @@ set(config_type $ENV{CMAKE_CONFIG_TYPE})
set(config_args ) set(config_args )
if(config_type) if(config_type)
set(config_args -C ${config_type}) set(config_args -C ${config_type})
endif() endif(config_type)
message(" ${config_args}") set(config_verbose )
if(CPackGen MATCHES "ZIP") if(CPackGen MATCHES "ZIP")
set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip") set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
@ -51,6 +51,7 @@ if(CPackGen MATCHES "ZIP")
set(expected_count 1) set(expected_count 1)
endif (${CPackComponentWay} STREQUAL "AllGroupsInOne") endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
elseif (CPackGen MATCHES "RPM") elseif (CPackGen MATCHES "RPM")
set(config_verbose -D "CPACK_RPM_PACKAGE_DEBUG=1")
set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.rpm") set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.rpm")
if (${CPackComponentWay} STREQUAL "default") if (${CPackComponentWay} STREQUAL "default")
set(expected_count 1) set(expected_count 1)
@ -77,7 +78,9 @@ if(expected_file_mask)
endif(expected_file) endif(expected_file)
endif(expected_file_mask) endif(expected_file_mask)
execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args} message("config_args = ${config_args}")
message("config_verbose = ${config_verbose}")
execute_process(COMMAND ${CPackCommand} ${config_verbose} -G ${CPackGen} ${config_args}
RESULT_VARIABLE CPack_result RESULT_VARIABLE CPack_result
OUTPUT_VARIABLE CPack_output OUTPUT_VARIABLE CPack_output
ERROR_VARIABLE CPack_error ERROR_VARIABLE CPack_error