[Cmake-commits] CMake branch, next, updated. v3.0.2-2059-g08a3581

[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  08a3581f34c1d83ae8aa3f7a73580477c3dfc6c1 (commit)
       via  7a373d5e55d6eec9448da7d3de145c0165f88577 (commit)
      from  8d2487be5758143e5a6b6f9da3bad09db46c46ac (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=08a3581f34c1d83ae8aa3f7a73580477c3dfc6c1
commit 08a3581f34c1d83ae8aa3f7a73580477c3dfc6c1
Merge: 8d2487b 7a373d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 14 10:02:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 14 10:02:36 2014 -0400

    Merge topic 'UseJava-classpath-cross-compile' into next
    
    7a373d5e UseJava: Fix classpath separator on WIN32 cross compilation (#15206)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a373d5e55d6eec9448da7d3de145c0165f88577
commit 7a373d5e55d6eec9448da7d3de145c0165f88577
Author:     Lorenz Witte <lorenz.witte at de.neusoft.com>
AuthorDate: Tue Oct 14 08:15:39 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 14 10:02:19 2014 -0400

    UseJava: Fix classpath separator on WIN32 cross compilation (#15206)
    
    The condition to use ";" as classpath separator includes a check for the
    switch "WIN32" which is a target switch.  When cross-compiling for a
    non-windows target, this switch is not present and the separator
    defaults to ":".  It should check for "CMAKE_HOST_WIN32" instead.

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 127012f..3a6acd8 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -398,7 +398,7 @@ function(add_jar _TARGET_NAME)
         ${CMAKE_JAVA_LIBRARY_OUTPUT_PATH}
     )
 
-    if (WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+    if (CMAKE_HOST_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 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake