summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-01-20 13:33:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-01-20 13:33:32 (GMT)
commit606ad1764ee8aff62368878576ecec7dd8671bae (patch)
tree07289139ce41c35acfcd51ac348ddb07e29917d0 /Modules
parent211d097998da4b730213645af4767fc24015f397 (diff)
parent18c3714f4f4cf35f2b040d887850cb3607345e5d (diff)
downloadCMake-606ad1764ee8aff62368878576ecec7dd8671bae.zip
CMake-606ad1764ee8aff62368878576ecec7dd8671bae.tar.gz
CMake-606ad1764ee8aff62368878576ecec7dd8671bae.tar.bz2
Merge topic 'java-updates'
18c3714f UseJava: Fix create_javah CLASSPATH handling on Windows
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseJava.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 6146d78..adaba02 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -1212,7 +1212,7 @@ function (create_javah)
set (_output_files)
if (WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
- set(_classpath_sep ";")
+ set(_classpath_sep "$<SEMICOLON>")
else ()
set(_classpath_sep ":")
endif()
@@ -1242,7 +1242,7 @@ function (create_javah)
endif()
endforeach()
string (REPLACE ";" "${_classpath_sep}" _classpath "${_classpath}")
- list (APPEND _javah_options -classpath ${_classpath})
+ list (APPEND _javah_options -classpath "${_classpath}")
endif()
if (_create_javah_OUTPUT_DIR)