[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6905-g5f76ea1

[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, next has been updated
       via  5f76ea1b2e613e0e83d0b81991e5ceb76fd55609 (commit)
       via  519084cd2e7d4943ea89721b90e98772f3dd44a4 (commit)
      from  78846206760b1d1b04aa97ffb32fd3e16c54e368 (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=5f76ea1b2e613e0e83d0b81991e5ceb76fd55609
commit 5f76ea1b2e613e0e83d0b81991e5ceb76fd55609
Merge: 7884620 519084c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 9 10:01:48 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 9 10:01:48 2014 -0500

    Merge topic 'find-java-os-x-fixes' into next
    
    519084c FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=519084cd2e7d4943ea89721b90e98772f3dd44a4
commit 519084cd2e7d4943ea89721b90e98772f3dd44a4
Author:     Joe Abbey <jabbey at arxan.com>
AuthorDate: Thu Jan 9 09:59:35 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 9 09:59:56 2014 -0500

    FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 29a247d..f1cb57e 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -238,6 +238,7 @@ find_path(JAVA_INCLUDE_PATH jni.h
 
 find_path(JAVA_INCLUDE_PATH2 jni_md.h
   ${JAVA_INCLUDE_PATH}
+  ${JAVA_INCLUDE_PATH}/darwin
   ${JAVA_INCLUDE_PATH}/win32
   ${JAVA_INCLUDE_PATH}/linux
   ${JAVA_INCLUDE_PATH}/freebsd

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

Summary of changes:
 Modules/FindJNI.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake