From 564b7311f41aad0aa26a463b546bcd742aecec85 Mon Sep 17 00:00:00 2001
From: Eric NOULARD <eric.noulard@gmail.com>
Date: Thu, 10 Mar 2011 09:48:46 +0100
Subject: CPackRPM  add more trace output in order to help failing diagnostics

---
 Modules/CPackRPM.cmake                                | 19 +++++++++++++++++++
 .../CPackComponentsForAll/RunCPackVerifyResult.cmake  | 11 +++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 026c45a..5ec7349 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -194,6 +194,25 @@ IF(NOT RPMBUILD_EXECUTABLE)
   MESSAGE(FATAL_ERROR "RPM package requires 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
 # to shut down warning about space in buildtree
 # some recent RPM version should support space in different places.
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 1fac232..ae0ee1a 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -30,8 +30,8 @@ set(config_type $ENV{CMAKE_CONFIG_TYPE})
 set(config_args )
 if(config_type)
   set(config_args -C ${config_type})
-endif()
-message(" ${config_args}")
+endif(config_type)
+set(config_verbose )
 
 if(CPackGen MATCHES "ZIP")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
@@ -51,10 +51,11 @@ if(CPackGen MATCHES "ZIP")
         set(expected_count 1)
     endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
 elseif (CPackGen MATCHES "RPM")
+    set(config_verbose -D "CPACK_RPM_PACKAGE_DEBUG=1")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.rpm")
     if (${CPackComponentWay} STREQUAL "default")
         set(expected_count 1)
-    endif(${CPackComponentWay} STREQUAL "default")
+    endif (${CPackComponentWay} STREQUAL "default")
     if (${CPackComponentWay} STREQUAL "OnePackPerGroup")
         set(expected_count 2)
     endif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
@@ -77,7 +78,9 @@ if(expected_file_mask)
   endif(expected_file)
 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
     OUTPUT_VARIABLE CPack_output
     ERROR_VARIABLE CPack_error
-- 
cgit v0.12