[Cmake-commits] CMake branch, master, updated. v3.6.2-951-gb936235
Brad King
brad.king at kitware.com
Wed Sep 14 08:56:21 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 b93623550dceac981aa4cc49f9e892c497aee49a (commit)
via 42ce9f1e7178b3535726c0c885cc7c9f760cc8b6 (commit)
via d5257063b04a95aca3d144f860698a3c7181e554 (commit)
via f81b9475f3724eef5d9e81b9190e30f5df09c808 (commit)
from 35e3836589535bae12208a403011c7e95e589a85 (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=b93623550dceac981aa4cc49f9e892c497aee49a
commit b93623550dceac981aa4cc49f9e892c497aee49a
Merge: 35e3836 42ce9f1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 08:56:19 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 08:56:19 2016 -0400
Merge topic 'add_androidmk_generator'
42ce9f1e Add support for creating prebuilt Android.mk files
d5257063 Export: Virtualize file generation step helpers
f81b9475 Export: Factor out file generation steps into helpers
-----------------------------------------------------------------------
Summary of changes:
Help/command/export.rst | 15 ++
Help/command/install.rst | 14 +-
Help/release/dev/add_androidmk_generator.rst | 10 +
Source/CMakeLists.txt | 4 +
Source/cmExportBuildAndroidMKGenerator.cxx | 193 ++++++++++++++++++++
Source/cmExportBuildAndroidMKGenerator.h | 68 +++++++
Source/cmExportCommand.cxx | 18 +-
Source/cmExportCommand.h | 1 +
Source/cmExportFileGenerator.cxx | 45 +++--
Source/cmExportFileGenerator.h | 39 ++--
Source/cmExportInstallAndroidMKGenerator.cxx | 146 +++++++++++++++
Source/cmExportInstallAndroidMKGenerator.h | 72 ++++++++
Source/cmExportInstallFileGenerator.cxx | 153 +++++++++-------
Source/cmExportInstallFileGenerator.h | 12 +-
Source/cmInstallCommand.cxx | 98 +++++++++-
Source/cmInstallCommand.h | 1 +
...r.cxx => cmInstallExportAndroidMKGenerator.cxx} | 115 ++----------
Source/cmInstallExportAndroidMKGenerator.h | 46 +++++
Source/cmInstallExportGenerator.cxx | 13 +-
Source/cmInstallExportGenerator.h | 3 +-
Tests/RunCMake/AndroidMK/AndroidMK-check.cmake | 30 +++
Tests/RunCMake/AndroidMK/AndroidMK.cmake | 11 ++
.../{ClangTidy => AndroidMK}/CMakeLists.txt | 2 +-
Tests/RunCMake/AndroidMK/RunCMakeTest.cmake | 2 +
.../RunCMake/AndroidMK/expectedBuildAndroidMK.txt | 23 +++
.../AndroidMK/expectedInstallAndroidMK.txt | 25 +++
.../foo.cpp => RunCMake/AndroidMK/foo.cxx} | 0
Tests/RunCMake/CMakeLists.txt | 2 +
28 files changed, 948 insertions(+), 213 deletions(-)
create mode 100644 Help/release/dev/add_androidmk_generator.rst
create mode 100644 Source/cmExportBuildAndroidMKGenerator.cxx
create mode 100644 Source/cmExportBuildAndroidMKGenerator.h
create mode 100644 Source/cmExportInstallAndroidMKGenerator.cxx
create mode 100644 Source/cmExportInstallAndroidMKGenerator.h
copy Source/{cmInstallExportGenerator.cxx => cmInstallExportAndroidMKGenerator.cxx} (59%)
create mode 100644 Source/cmInstallExportAndroidMKGenerator.h
create mode 100644 Tests/RunCMake/AndroidMK/AndroidMK-check.cmake
create mode 100644 Tests/RunCMake/AndroidMK/AndroidMK.cmake
copy Tests/RunCMake/{ClangTidy => AndroidMK}/CMakeLists.txt (56%)
create mode 100644 Tests/RunCMake/AndroidMK/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/AndroidMK/expectedBuildAndroidMK.txt
create mode 100644 Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt
copy Tests/{CTestCoverageCollectGCOV/TestProject/3rdparty/foo.cpp => RunCMake/AndroidMK/foo.cxx} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list