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 8a09910b118c5b4ac09e80ed403bf5533668c749 (commit)
via 0dfc1e1d7d9005a59927de491d7f78113fb908ff (commit)
from 91af161d5fe10ad40c5fcc36ed7629b7a34c01be (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=8a09910b118c5b4ac09e80ed403bf5533668c749
commit 8a09910b118c5b4ac09e80ed403bf5533668c749
Merge: 91af161 0dfc1e1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 7 10:56:29 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Mar 7 10:56:29 2014 -0500
Merge topic 'dev/string-apis' into next
0dfc1e1d CPackWiX: Fix test to build with expected config
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dfc1e1d7d9005a59927de491d7f78113fb908ff
commit 0dfc1e1d7d9005a59927de491d7f78113fb908ff
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 7 10:53:45 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 7 10:53:45 2014 -0500
CPackWiX: Fix test to build with expected config
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 854b239..7b4d149 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -829,6 +829,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
if(WIX_LIGHT_EXECUTABLE)
add_test(CPackWiXGenerator ${CMAKE_CTEST_COMMAND}
+ -C \${CTEST_CONFIGURATION_TYPE}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator"
"${CMake_BINARY_DIR}/Tests/CPackWiXGenerator"
@@ -837,6 +838,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
--build-options ${build_options}
--test-command ${CMAKE_CMAKE_COMMAND}
"-DCPackWiXGenerator_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackWiXGenerator"
+ "-Dconfig=\${CTEST_CONFIGURATION_TYPE}"
-P
"${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake")
endif()
endif()
diff --git a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake
b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake
index 30e33cf..ca9fd90 100644
--- a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake
+++ b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake
@@ -10,7 +10,12 @@ message(STATUS "CMAKE_COMMAND: ${CMAKE_COMMAND}")
message(STATUS "CMAKE_CPACK_COMMAND: ${CMAKE_CPACK_COMMAND}")
message(STATUS "CPackWiXGenerator_BINARY_DIR: ${CPackWiXGenerator_BINARY_DIR}")
+if(config)
+ set(_C_config -C ${config})
+endif()
+
execute_process(COMMAND "${CMAKE_CPACK_COMMAND}"
+ ${_C_config}
RESULT_VARIABLE CPack_result
OUTPUT_VARIABLE CPack_output
ERROR_VARIABLE CPack_error
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 ++
Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake | 5 +++++
2 files changed, 7 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
