Merge topic 'UseJava-cross-compile'
778aacc
Allow using Java in a cross-compilation toolchain
This commit is contained in:
commit
f2a0671259
|
@ -242,7 +242,7 @@ function(add_jar _TARGET_NAME)
|
||||||
${CMAKE_JAVA_LIBRARY_OUTPUT_PATH}
|
${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 ";")
|
set(CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
|
||||||
else ()
|
else ()
|
||||||
set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
|
set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
|
||||||
|
|
Loading…
Reference in New Issue