diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-03 14:20:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-03 14:20:47 (GMT) |
| commit | 25b7f87ecadb400db0d206e938ec1d2771d735a7 (patch) | |
| tree | 104a6a84f046a6a9a0b9701213fa84c41698eaa7 /Tests/X11 | |
| parent | 6f6caee388483c913c54f69a75c16b7652449cdd (diff) | |
| parent | 0a561a03475f4ed1e017802970a8f17998fe05c3 (diff) | |
| download | CMake-25b7f87ecadb400db0d206e938ec1d2771d735a7.zip CMake-25b7f87ecadb400db0d206e938ec1d2771d735a7.tar.gz CMake-25b7f87ecadb400db0d206e938ec1d2771d735a7.tar.bz2 | |
Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-master
Resolve conflict in Source/cmTarget.cxx by integrating the changes to
the internal copy constructor from both sides. Also resolve a logical
conflict by dropping the special case for INTERFACE_LIBRARY targets.
Since cmTarget::SetMakefile already forces CMP0022 to NEW for such
targets we need no special handling.
Resolve conflict in Source/cmTargetLinkLibrariesCommand.h by dropping
the documentation change. We will make the same change in the new
location of the same documentation in a separate commit.
Resolve conflicts in
Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt
Tests/RunCMake/CMP0022/RunCMakeTest.cmake
by taking the side from the 'policy-CMP0022-fixes' branch.
Diffstat (limited to 'Tests/X11')
0 files changed, 0 insertions, 0 deletions