[Cmake-commits] CMake branch, master, updated. v3.9.0-rc6-284-g4b460a5
Kitware Robot
kwrobot at kitware.com
Thu Jul 13 10:15:18 EDT 2017
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 4b460a5ba8cdb36e05c1517237c8ef15562e4490 (commit)
via 489a7706c25b604fa06644ab5044a9f5954b7953 (commit)
via d11c48e0e344e6758a5575330b3f0e267d820e02 (commit)
via 4bafa3922e3773e5bcc6741994379455c7d1c0fc (commit)
from aa97170f2b25a99d2cc69fd6b2a059e52872f341 (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=4b460a5ba8cdb36e05c1517237c8ef15562e4490
commit 4b460a5ba8cdb36e05c1517237c8ef15562e4490
Merge: 489a770 d11c48e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 13 10:08:27 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 13 10:08:27 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=489a7706c25b604fa06644ab5044a9f5954b7953
commit 489a7706c25b604fa06644ab5044a9f5954b7953
Merge: aa97170 4bafa39
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 13 14:07:32 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 13 10:07:36 2017 -0400
Merge topic 'android-system-include-last'
4bafa392 Android: Always add standard include directories last
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1052
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Android-Common.cmake | 1 -
Source/cmGeneratorTarget.cxx | 12 ------------
Source/cmLocalGenerator.cxx | 14 ++++++++++++++
Tests/RunCMake/Android/android_sysinc.c | 7 +++++++
Tests/RunCMake/Android/android_sysinc.cxx | 7 +++++++
Tests/RunCMake/Android/common.cmake | 16 ++++++++++++++++
Tests/RunCMake/Android/sysinc/dlfcn.h | 1 +
7 files changed, 45 insertions(+), 13 deletions(-)
create mode 100644 Tests/RunCMake/Android/android_sysinc.c
create mode 100644 Tests/RunCMake/Android/android_sysinc.cxx
create mode 100644 Tests/RunCMake/Android/sysinc/dlfcn.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list