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 320f5bdc1cce81292367b04ebcb733375ab81d61 (commit)
via 819f23c6ce515c1b8faa390a9bc850bea3eb4072 (commit)
via 8ccd6aab9a0b2f3df48abdc6ed5086dcca576224 (commit)
from 9470d1e8bbcdd258fae66165f9cfdb76b7175179 (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=320f5bdc1cce81292367b04ebcb733375ab81d61
commit 320f5bdc1cce81292367b04ebcb733375ab81d61
Merge: 9470d1e 819f23c
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Tue Aug 30 14:51:35 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 30 14:51:35 2016 -0400
Merge topic '16101-xcode-fix-directory-exclude-from-all' into next
819f23c6 fixup! Xcode: Add targets marked as EXCLUDE_FROM_ALL to project
(#16101)
8ccd6aab fixup! Xcode: Add targets marked as EXCLUDE_FROM_ALL to project
(#16101)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=819f23c6ce515c1b8faa390a9bc850bea3eb4072
commit 819f23c6ce515c1b8faa390a9bc850bea3eb4072
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Tue Aug 30 20:50:19 2016 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Tue Aug 30 20:50:19 2016 +0200
fixup! Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
diff --git a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
index 6d9418b..88b9283 100644
--- a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
+++ b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
@@ -4,7 +4,7 @@ run_cmake(DoesNotExist)
run_cmake(Missing)
run_cmake(Function)
-set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ExcludeFromAll)
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ExcludeFromAll-build)
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ccd6aab9a0b2f3df48abdc6ed5086dcca576224
commit 8ccd6aab9a0b2f3df48abdc6ed5086dcca576224
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Tue Aug 30 20:36:53 2016 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Tue Aug 30 20:36:53 2016 +0200
fixup! Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
index 2789e61..c9ad322 100644
--- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
@@ -1,3 +1,6 @@
#include "foo.h"
-int foo() { return 42; }
+int foo()
+{
+ return 42;
+}
diff --git a/Tests/RunCMake/add_subdirectory/main.cpp
b/Tests/RunCMake/add_subdirectory/main.cpp
index 8e69c08..1dc3906 100644
--- a/Tests/RunCMake/add_subdirectory/main.cpp
+++ b/Tests/RunCMake/add_subdirectory/main.cpp
@@ -2,5 +2,5 @@
int main(int, char**)
{
- return foo();
+ return foo();
}
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp | 5 ++++-
Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake | 2 +-
Tests/RunCMake/add_subdirectory/main.cpp | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
