From 778aacc864d050f6b1213dff0a3211723f79f928 Mon Sep 17 00:00:00 2001 From: Gregoire Lejeune Date: Tue, 29 May 2012 22:23:15 +0200 Subject: 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. --- Modules/UseJava.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ":") -- cgit v0.12