[Cmake-commits] CMake branch, next, updated. v2.8.4-998-gb831e88

[Eric Noulard]

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  b831e88b5acbf9749980a02157e1c726884c5479 (commit)
       via  3fb89cf8bdae9b534dddb45b786903de4c9ac7aa (commit)
      from  3397e54c3c77d1b1f713e6066a47154cc8d487d7 (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=b831e88b5acbf9749980a02157e1c726884c5479
commit b831e88b5acbf9749980a02157e1c726884c5479
Merge: 3397e54 3fb89cf
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Feb 23 18:50:22 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 23 18:50:22 2011 -0500

    Merge topic 'CPack-ChangeComponentNamingScheme' into next
    
    3fb89cf CPack remove previously CPack generated files (if any) before running CPack


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fb89cf8bdae9b534dddb45b786903de4c9ac7aa
commit 3fb89cf8bdae9b534dddb45b786903de4c9ac7aa
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Feb 24 00:43:29 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Feb 24 00:49:11 2011 +0100

    CPack remove previously CPack generated files (if any) before running CPack

diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index d5137bd..45a3b17 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -32,17 +32,6 @@ if(config_type)
   set(config_args -C ${config_type})
 endif()
 message(" ${config_args}")
-execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
-    RESULT_VARIABLE CPack_result
-    OUTPUT_VARIABLE CPack_output
-    ERROR_VARIABLE CPack_error
-    WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
-
-if (CPack_result)
-  message(FATAL_ERROR "error: CPack execution went wrong!, CPack_output=${CPack_output}, CPack_error=${CPack_error}")
-else (CPack_result)
-  message(STATUS "CPack_output=${CPack_output}")
-endif(CPack_result)
 
 if(CPackGen MATCHES "ZIP")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
@@ -63,6 +52,26 @@ if(CPackGen MATCHES "ZIP")
     endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
 endif(CPackGen MATCHES "ZIP")
 
+# clean-up previously CPack generated files
+if(expected_file_mask)
+  file(GLOB expected_file "${expected_file_mask}")
+  if (expected_file)
+    file(REMOVE ${expected_file})
+  endif(expected_file)
+endif(expected_file_mask)
+
+execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
+    RESULT_VARIABLE CPack_result
+    OUTPUT_VARIABLE CPack_output
+    ERROR_VARIABLE CPack_error
+    WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
+
+if (CPack_result)
+  message(FATAL_ERROR "error: CPack execution went wrong!, CPack_output=${CPack_output}, CPack_error=${CPack_error}")
+else (CPack_result)
+  message(STATUS "CPack_output=${CPack_output}")
+endif(CPack_result)
+
 # Now verify if the number of expected file is OK
 # - using expected_file_mask and
 # - expected_count

-----------------------------------------------------------------------

Summary of changes:
 .../RunCPackVerifyResult.cmake                     |   31 +++++++++++++-------
 1 files changed, 20 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake