[Cmake-commits] CMake branch, master, updated. v3.6.1-820-g0a2d0b1
Brad King
brad.king at kitware.com
Wed Aug 31 09:19:49 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, master has been updated
via 0a2d0b126ca01a7d989a887c71693989e9d15224 (commit)
via df32e564aed43470e304cf21d8c9ac1d5a01d055 (commit)
from a9affa07cdeea6b66c920e4826abfe59854f7ffa (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=0a2d0b126ca01a7d989a887c71693989e9d15224
commit 0a2d0b126ca01a7d989a887c71693989e9d15224
Merge: a9affa0 df32e56
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 31 09:19:46 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 31 09:19:46 2016 -0400
Merge topic '16101-xcode-fix-directory-exclude-from-all'
df32e564 Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 13 ++++---------
Source/cmGlobalXCodeGenerator.h | 3 +--
Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake | 6 ++++++
.../add_subdirectory/ExcludeFromAll/CMakeLists.txt | 4 ++++
Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp | 1 +
.../foo.c => add_subdirectory/ExcludeFromAll/foo.cpp} | 2 ++
.../{Framework => add_subdirectory/ExcludeFromAll}/foo.h | 0
Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake | 12 ++++++++++++
Tests/RunCMake/add_subdirectory/main.cpp | 6 ++++++
9 files changed, 36 insertions(+), 11 deletions(-)
create mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
create mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
create mode 100644 Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
copy Tests/RunCMake/{Framework/foo.c => add_subdirectory/ExcludeFromAll/foo.cpp} (60%)
copy Tests/RunCMake/{Framework => add_subdirectory/ExcludeFromAll}/foo.h (100%)
create mode 100644 Tests/RunCMake/add_subdirectory/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list