From af16607b7c4aa2df97d97cb7b53303bfcde20788 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 3 Jan 2022 00:53:09 +0100 Subject: [PATCH 1/1] Fix Java builds on native windows --- examples/deprecated/java/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/deprecated/java/CMakeLists.txt b/examples/deprecated/java/CMakeLists.txt index afcdd5237c..64ae09af79 100644 --- a/examples/deprecated/java/CMakeLists.txt +++ b/examples/deprecated/java/CMakeLists.txt @@ -46,7 +46,13 @@ foreach (example app-bittorrent app-centralizedmutex app-masterworker app-pingpo add_dependencies(java-all java-${example}) string (REPLACE "-" "/" example_dir ${example}) - ADD_TESH(java-${example} --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/java --setenv LD_LIBRARY_PATH=${TESH_LIBRARY_PATH} --setenv classpath="${TESH_CLASSPATH}:${example}.jar" --cd ${CMAKE_BINARY_DIR}/examples/deprecated/java/${example_dir} ${CMAKE_HOME_DIRECTORY}/examples/deprecated/java/${example_dir}/${example}.tesh) + if (WIN32) + set (cp "${TESH_CLASSPATH};${example}.jar") + else() + set (cp "${TESH_CLASSPATH}:${example}.jar") + endif() + ADD_TESH(java-${example} --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/java --setenv LD_LIBRARY_PATH=${TESH_LIBRARY_PATH} --setenv classpath="${cp}" --cd ${CMAKE_BINARY_DIR}/examples/deprecated/java/${example_dir} ${CMAKE_HOME_DIRECTORY}/examples/deprecated/java/${example_dir}/${example}.tesh) + unset(cp) endif() set(examples_src ${examples_src} ${${example}_sources}) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${example_dir}/${example}.tesh) -- 2.20.1