diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-21 19:07:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-21 19:07:55 (GMT) |
| commit | 6dc0bbbd56fc28a6d24c8d8603ccc890310406fe (patch) | |
| tree | 8401285b0bfb894920661af9d32495ca013ad612 /Modules | |
| parent | 43cb7fadb4b0c3c34478b6fc2e33b12258d1dd22 (diff) | |
| parent | 7a373d5e55d6eec9448da7d3de145c0165f88577 (diff) | |
| download | CMake-6dc0bbbd56fc28a6d24c8d8603ccc890310406fe.zip CMake-6dc0bbbd56fc28a6d24c8d8603ccc890310406fe.tar.gz CMake-6dc0bbbd56fc28a6d24c8d8603ccc890310406fe.tar.bz2 | |
Merge topic 'UseJava-classpath-cross-compile'
7a373d5e UseJava: Fix classpath separator on WIN32 cross compilation (#15206)
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 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 ":") |