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 cd4b2e96fbc1f25f215baec95e10c6b338e7adc9 (commit)
via aebd6167111f2fc6247dc173ff16917316bbe660 (commit)
from d708b54d0dc44340c71b7288a719f846c4b27a39 (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=cd4b2e96fbc1f25f215baec95e10c6b338e7adc9
commit cd4b2e96fbc1f25f215baec95e10c6b338e7adc9
Merge: d708b54 aebd616
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Aug 25 10:15:46 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Aug 25 10:15:46 2016 -0400
Merge topic '16101-xcode-fix-directory-exclude-from-all' into next
aebd6167 Revert "Xcode: Add targets marked as EXCLUDE_FROM_ALL to project
(#16101)"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aebd6167111f2fc6247dc173ff16917316bbe660
commit aebd6167111f2fc6247dc173ff16917316bbe660
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Aug 25 10:15:09 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Aug 25 10:15:09 2016 -0400
Revert "Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)"
This reverts commit a0fbdb8b2c928306848dd19de0ceaf5a90c741a7.
It has some compile warnings, test failures, and style violations.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 7b7c744..780ca90 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2639,6 +2639,9 @@ bool cmGlobalXCodeGenerator::CreateGroups(
{
for (std::vector<cmLocalGenerator*>::iterator i = generators.begin();
i != generators.end(); ++i) {
+ if (this->IsExcluded(root, *i)) {
+ continue;
+ }
cmMakefile* mf = (*i)->GetMakefile();
std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
@@ -3038,8 +3041,10 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
std::vector<cmXCodeObject*> targets;
for (std::vector<cmLocalGenerator*>::iterator i = generators.begin();
i != generators.end(); ++i) {
- if (!this->CreateXCodeTargets(*i, targets)) {
- return false;
+ if (!this->IsExcluded(root, *i)) {
+ if (!this->CreateXCodeTargets(*i, targets)) {
+ return false;
+ }
}
}
// loop over all targets and add link and depend info
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
deleted file mode 100644
index f686005..0000000
--- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-enable_language(CXX)
-
-add_subdirectory(ExcludeFromAll EXCLUDE_FROM_ALL)
-
-add_executable(main main.cpp)
-target_link_libraries(main PRIVATE foo)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
deleted file mode 100644
index b1df6b0..0000000
--- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_library(bar STATIC bar.cpp)
-
-add_library(foo STATIC foo.cpp)
-target_include_directories(foo PUBLIC .)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
deleted file mode 100644
index 7a828bd..0000000
--- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#error This should be excluded from all target
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
deleted file mode 100644
index 2789e61..0000000
--- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "foo.h"
-
-int foo() { return 42; }
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
deleted file mode 100644
index 5d5f8f0..0000000
--- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
+++ /dev/null
@@ -1 +0,0 @@
-int foo();
diff --git a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
index 6d9418b..9d514e1 100644
--- a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
+++ b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
@@ -3,15 +3,3 @@ include(RunCMake)
run_cmake(DoesNotExist)
run_cmake(Missing)
run_cmake(Function)
-
-set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ExcludeFromAll)
-set(RunCMake_TEST_NO_CLEAN 1)
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
-run_cmake(ExcludeFromAll)
-run_cmake_command(ExcludeFromAll-build ${CMAKE_COMMAND} --build .)
-
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)
diff --git a/Tests/RunCMake/add_subdirectory/main.cpp
b/Tests/RunCMake/add_subdirectory/main.cpp
deleted file mode 100644
index 1fbb144..0000000
--- a/Tests/RunCMake/add_subdirectory/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "foo.h"
-
-int main(int argc, char* argv[])
-{
- return foo();
-}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 9 +++++++--
Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake | 6 ------
.../add_subdirectory/ExcludeFromAll/CMakeLists.txt | 4 ----
Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp | 1 -
Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp | 3 ---
Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h | 1 -
Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake | 12 ------------
Tests/RunCMake/add_subdirectory/main.cpp | 6 ------
8 files changed, 7 insertions(+), 35 deletions(-)
delete mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
delete mode 100644
Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
delete mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
delete mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
delete mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
delete mode 100644 Tests/RunCMake/add_subdirectory/main.cpp
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
