Merge topic 'UseJava-classpath-cross-compile'

7a373d5e UseJava: Fix classpath separator on WIN32 cross compilation (#15206)
This commit is contained in:
Brad King 2014-10-21 15:07:55 -04:00 committed by CMake Topic Stage
commit 6dc0bbbd56
1 changed files with 1 additions and 1 deletions

View File

@ -398,7 +398,7 @@ function(add_jar _TARGET_NAME)
${CMAKE_JAVA_LIBRARY_OUTPUT_PATH} ${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 ";") set(CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
else () else ()
set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":") set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":")