[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2919-g9a4d9d6

[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  9a4d9d653cbb00d76d943375430211c0ef509780 (commit)
       via  778aacc864d050f6b1213dff0a3211723f79f928 (commit)
      from  a9468769be44aaefbfc10297799e41c09883c101 (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=9a4d9d653cbb00d76d943375430211c0ef509780
commit 9a4d9d653cbb00d76d943375430211c0ef509780
Merge: a946876 778aacc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 9 09:18:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 9 09:18:08 2013 -0400

    Merge topic 'UseJava-cross-compile' into next
    
    778aacc Allow using Java in a cross-compilation toolchain


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=778aacc864d050f6b1213dff0a3211723f79f928
commit 778aacc864d050f6b1213dff0a3211723f79f928
Author:     Gregoire Lejeune <gregoire.lejeune at gmail.com>
AuthorDate: Tue May 29 22:23:15 2012 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 8 11:45:34 2013 -0400

    Allow using Java in a cross-compilation toolchain
    
    Since Java is a portable language, if you want to use Java when
    cross-compiling, UseJava uses the JVM installed on the host.  So in this
    case, we must use set CMAKE_JAVA_INCLUDE_FLAG_SEP for the current host.

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 0438695..e686c1d 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -242,7 +242,7 @@ function(add_jar _TARGET_NAME)
         ${CMAKE_JAVA_LIBRARY_OUTPUT_PATH}
     )
 
-    if (WIN32 AND NOT CYGWIN)
+    if (WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
         set(CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
     else ()
         set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":")

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

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


hooks/post-receive
-- 
CMake