summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorGregoire Lejeune <gregoire.lejeune@gmail.com>2012-05-29 22:23:15 +0200
committerBrad King <brad.king@kitware.com>2013-05-08 11:45:34 -0400
commit778aacc864d050f6b1213dff0a3211723f79f928 (patch)
tree8dfd43f1649dea7257ba5ff603feae0a1bfe8f2d /Modules
parentff298fff79b2dd9773f027573c7f862a18e0bc36 (diff)
downloadcmake-778aacc864d050f6b1213dff0a3211723f79f928.tar.gz
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.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseJava.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 043869519e..e686c1d0d3 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 ":")