diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:38:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:38:16 (GMT) |
| commit | f2a0671259a1ac769dc2f4f3628aab2f938472ab (patch) | |
| tree | 3ad26860ccfeac9cf7db2ac85176750c5f32a0c3 /Modules | |
| parent | 19bd84b3cde8b2d5453d937064ff91373874888f (diff) | |
| parent | 778aacc864d050f6b1213dff0a3211723f79f928 (diff) | |
| download | CMake-f2a0671259a1ac769dc2f4f3628aab2f938472ab.zip CMake-f2a0671259a1ac769dc2f4f3628aab2f938472ab.tar.gz CMake-f2a0671259a1ac769dc2f4f3628aab2f938472ab.tar.bz2 | |
Merge topic 'UseJava-cross-compile'
778aacc Allow using Java in a cross-compilation toolchain
Diffstat (limited to 'Modules')
| -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 0438695..e686c1d 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 ":") |