[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1316-g14fe404

[Brad King]

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  14fe4049569d512c85efd7115a28857146be742a (commit)
       via  dd72b19f861d6c39796fdf9950f585f0368348a9 (commit)
       via  70560ee1466ffc73878afa7ad34937bf154903f6 (commit)
       via  fcd66a7f7b944f95372386332381a11c3b8b1508 (commit)
       via  4b3614b25a10bf558b3687cee5bac012779866e3 (commit)
      from  5b494fd0418cdf3bc26ecc45f1426ebd1b407ea4 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14fe4049569d512c85efd7115a28857146be742a
commit 14fe4049569d512c85efd7115a28857146be742a
Merge: 5b494fd dd72b19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 3 11:11:05 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 3 11:11:05 2014 -0500

    Merge topic 'find-java-os-x-fixes'
    
    dd72b19f Find{Java,JNI}: Use /usr/libexec/java_home on OS X
    70560ee1 FindJNI: Overhaul finding JDK libraries and headers on OS X
    fcd66a7f Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME}
    4b3614b2 Find{Java,JNI}: Use ENV{JAVA_HOME} first when set


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

Summary of changes:
 Modules/CMakeFindJavaCommon.cmake |   41 ++++++++++++
 Modules/FindJNI.cmake             |  132 ++++++++++++++++++++++---------------
 Modules/FindJava.cmake            |   15 +++--
 3 files changed, 132 insertions(+), 56 deletions(-)
 create mode 100644 Modules/CMakeFindJavaCommon.cmake


hooks/post-receive
-- 
CMake