diff options
| author | Lorenz Witte <lorenz.witte@de.neusoft.com> | 2014-10-14 06:15:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-14 14:02:19 (GMT) |
| commit | 7a373d5e55d6eec9448da7d3de145c0165f88577 (patch) | |
| tree | 924c6e5eaadc7294ce935f3ec70640b909d09381 /Modules/UseJava.cmake | |
| parent | c113efa7033e27ee3b7a0d4803647830462c3025 (diff) | |
| download | CMake-7a373d5e55d6eec9448da7d3de145c0165f88577.zip CMake-7a373d5e55d6eec9448da7d3de145c0165f88577.tar.gz CMake-7a373d5e55d6eec9448da7d3de145c0165f88577.tar.bz2 | |
UseJava: Fix classpath separator on WIN32 cross compilation (#15206)
The condition to use ";" as classpath separator includes a check for the
switch "WIN32" which is a target switch. When cross-compiling for a
non-windows target, this switch is not present and the separator
defaults to ":". It should check for "CMAKE_HOST_WIN32" instead.
Diffstat (limited to 'Modules/UseJava.cmake')
| -rw-r--r-- | Modules/UseJava.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 127012f..3a6acd8 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -398,7 +398,7 @@ function(add_jar _TARGET_NAME) ${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 ";") else () set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":") |