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 93aad74a0ef9c9ae887b51891c3a9cf247bfc1ea (commit)
via 0d6029c3e007a1fb308dc313fe6b08b49587bade (commit)
via 3f77538ad3d984d341f515ebb725a01bbb437e0b (commit)
from eefab19dc8f52df10efe4caa37b7c4fad61f0734 (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=93aad74a0ef9c9ae887b51891c3a9cf247bfc1ea
commit 93aad74a0ef9c9ae887b51891c3a9cf247bfc1ea
Merge: eefab19 0d6029c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun May 10 09:28:44 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun May 10 09:28:44 2015 -0400
Merge topic 'ctest-no-make-i' into next
0d6029c3 fixup! CTest: Stop telling 'make' to ignore errors with -i
3f77538a build_command: Choose configuration consistently across signatures
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d6029c3e007a1fb308dc313fe6b08b49587bade
commit 0d6029c3e007a1fb308dc313fe6b08b49587bade
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun May 10 09:25:30 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Sun May 10 09:25:30 2015 -0400
fixup! CTest: Stop telling 'make' to ignore errors with -i
diff --git a/Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-result.txt
b/Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-result.txt
new file mode 100644
index 0000000..9cdf4a5
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-result.txt
@@ -0,0 +1 @@
+(0|-1|255)
diff --git a/Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt
b/Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt
new file mode 100644
index 0000000..af70ac3
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt
@@ -0,0 +1,2 @@
+^(Error\(s\) when building project
+)?ctest_build returned zero$
diff --git a/Tests/RunCMake/ctest_build/BuildFailure-stderr.txt
b/Tests/RunCMake/ctest_build/BuildFailure-stderr.txt
index c984df0..1e6ad87 100644
--- a/Tests/RunCMake/ctest_build/BuildFailure-stderr.txt
+++ b/Tests/RunCMake/ctest_build/BuildFailure-stderr.txt
@@ -1 +1,2 @@
-^Error\(s\) when building project$
+^Error\(s\) when building project
+ctest_build returned non-zero$
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 21f9ae7..c6f732c 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -16,6 +16,13 @@ add_custom_target(BuildFailure ALL COMMAND
command-does-not-exist)
set(CASE_TEST_PREFIX_CODE [[
cmake_policy(SET CMP0061 NEW)
]])
+ set(CASE_TEST_SUFFIX_CODE [[
+if (ctest_build_return_value)
+ message("ctest_build returned non-zero")
+else()
+ message("ctest_build returned zero")
+endif()
+]])
run_ctest(BuildFailure)
if (RunCMake_GENERATOR MATCHES "Makefiles")
diff --git a/Tests/RunCMake/ctest_build/test.cmake.in
b/Tests/RunCMake/ctest_build/test.cmake.in
index 6f89a65..768f1c6 100644
--- a/Tests/RunCMake/ctest_build/test.cmake.in
+++ b/Tests/RunCMake/ctest_build/test.cmake.in
@@ -13,4 +13,5 @@ set(CTEST_BUILD_CONFIGURATION
"$ENV{CMAKE_CONFIG_TYPE}")
set(ctest_build_args "@CASE_CTEST_BUILD_ARGS@")
ctest_start(Experimental)
ctest_configure()
-ctest_build(${ctest_build_args})
+ctest_build(${ctest_build_args} RETURN_VALUE ctest_build_return_value)
+@CASE_TEST_SUFFIX_CODE@
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f77538ad3d984d341f515ebb725a01bbb437e0b
commit 3f77538ad3d984d341f515ebb725a01bbb437e0b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun May 10 09:05:52 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Sun May 10 09:07:06 2015 -0400
build_command: Choose configuration consistently across signatures
Teach the legacy two-argument signature to use CMAKE_CONFIG_TYPE
from the environment only if it is non-empty. This makes behavior
consistent with the main signature.
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx
index c6c9804..62fafa5 100644
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@@ -130,7 +130,7 @@ bool cmBuildCommand
std::string configType = "Release";
const char* cfg = getenv("CMAKE_CONFIG_TYPE");
- if ( cfg )
+ if ( cfg && *cfg )
{
configType = cfg;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmBuildCommand.cxx | 2 +-
Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-result.txt | 1 +
Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt | 2 ++
Tests/RunCMake/ctest_build/BuildFailure-stderr.txt | 3 ++-
Tests/RunCMake/ctest_build/RunCMakeTest.cmake | 7 +++++++
Tests/RunCMake/ctest_build/test.cmake.in | 3 ++-
6 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644
Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-result.txt
create mode 100644
Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
