[Cmake-commits] CMake branch, master, updated. v3.10.2-1073-gcab9838

Kitware Robot kwrobot at kitware.com
Thu Feb 15 08:45:09 EST 2018


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  cab9838b4c015d57476b579275adcad4e724354f (commit)
       via  8bd3e13ec305798c02cb2d4aecb7766fd11b99bb (commit)
       via  02edf08be2b9476f442b702c6c00447912425cc2 (commit)
       via  b6d68766b1a8537a3a130a38aa91936e579da6fd (commit)
       via  56e1688517ab040cf9554926070830df475980b3 (commit)
      from  cbdec57937597c67be8ca138f37c66c9aa7936ff (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=cab9838b4c015d57476b579275adcad4e724354f
commit cab9838b4c015d57476b579275adcad4e724354f
Merge: 8bd3e13 02edf08
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 15 08:43:32 2018 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 15 08:43:32 2018 -0500

    Merge branch 'release-3.11'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bd3e13ec305798c02cb2d4aecb7766fd11b99bb
commit 8bd3e13ec305798c02cb2d4aecb7766fd11b99bb
Merge: cbdec57 b6d6876
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 15 13:41:49 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Feb 15 08:42:47 2018 -0500

    Merge topic 'export-android-mk'
    
    b6d68766 Android.mk: Fix export of static libraries with PRIVATE dependencies
    56e16885 Android.mk: Evaluate generator expressions up front
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1766


-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportBuildAndroidMKGenerator.cxx |   28 ++++++++++++++++------------
 Tests/RunCMake/AndroidMK/AndroidMK.cmake   |    2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list