[Cmake-commits] CMake branch, next, updated. v3.5.0-611-g5b52a4c
Brad King
brad.king at kitware.com
Wed Mar 23 11:01:55 EDT 2016
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 5b52a4c56ccb104669df0d1785053434aae558a1 (commit)
via 28fbe7c4c59ca6b30e59f894b8d396512a317154 (commit)
from 042655d5606b4867862ff91cfb18319170a47945 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b52a4c56ccb104669df0d1785053434aae558a1
commit 5b52a4c56ccb104669df0d1785053434aae558a1
Merge: 042655d 28fbe7c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 11:01:52 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 23 11:01:52 2016 -0400
Merge topic 'cmake-depend-in-project-only' into next
28fbe7c4 fixup! Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variable
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28fbe7c4c59ca6b30e59f894b8d396512a317154
commit 28fbe7c4c59ca6b30e59f894b8d396512a317154
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 09:32:24 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 23 09:32:24 2016 -0400
fixup! Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variable
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 8d56639..6b2b85a 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -41,7 +41,8 @@ endif()
run_BuildDepends(Custom-Always)
-if(RunCMake_GENERATOR MATCHES "Make")
+if(RunCMake_GENERATOR MATCHES "Make" AND
+ NOT "${RunCMake_BINARY_DIR}" STREQUAL "${RunCMake_SOURCE_DIR}")
run_BuildDepends(MakeInProjectOnly)
endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list