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 d555dd3854f7b59f1c335a05f1920908ee3f1fcd (commit)
via 86979e49a16b0fc2976329480d236e62471f331a (commit)
from 35cd1383e56e1aef0a1c35f75aab328ff3150094 (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=d555dd3854f7b59f1c335a05f1920908ee3f1fcd
commit d555dd3854f7b59f1c335a05f1920908ee3f1fcd
Merge: 35cd138 86979e4
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Dec 14 15:06:36 2010 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 14 15:06:36 2010 -0500
Merge topic 'CPack-AddMoreTests' into next
86979e4 Change cpack run and verify script to work with multi-config
generators.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86979e49a16b0fc2976329480d236e62471f331a
commit 86979e49a16b0fc2976329480d236e62471f331a
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Dec 14 13:42:21 2010 -0500
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Dec 14 13:42:21 2010 -0500
Change cpack run and verify script to work with multi-config generators.
Use the location of the running cmake to find cpack, and use the
CMAKE_CONFIG_TYPE environtment variable as a type for cpack.
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index b0cacb8..11f72ec 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -9,7 +9,9 @@ endif(NOT CPackComponentsForAll_BINARY_DIR)
if(NOT CPackGen)
message(FATAL_ERROR "CPackGen not set")
endif(NOT CPackGen)
-
+get_filename_component(CPACK_LOCATION ${CMAKE_COMMAND} PATH)
+set(CPackCommand "${CPACK_LOCATION}/cpack")
+message("cpack = ${CPackCommand}")
if(NOT CPackCommand)
message(FATAL_ERROR "CPackCommand not set")
endif(NOT CPackCommand)
@@ -24,8 +26,13 @@ set(expected_file_mask "")
# May produce several numbers of files depending on
# CPACK_COMPONENT_xxx values
set(expected_count 1)
-
-execute_process(COMMAND ${CPackCommand} -G ${CPackGen} -C Release
+set(config_type $ENV{CMAKE_CONFIG_TYPE})
+set(config_args )
+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
-----------------------------------------------------------------------
Summary of changes:
.../RunCPackVerifyResult.cmake | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
