Merge topic 'UseJava-cross-compile'

778aacc Allow using Java in a cross-compilation toolchain
This commit is contained in:
Brad King 2013-05-16 14:38:16 -04:00 committed by CMake Topic Stage
commit f2a0671259
1 changed files with 1 additions and 1 deletions

View File

@ -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 ":")