From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sun, 2 Jan 2022 23:53:09 +0000 (+0100)
Subject: Fix Java builds on native windows
X-Git-Tag: v3.30~144
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/af16607b7c4aa2df97d97cb7b53303bfcde20788?hp=46e6a9d4b116a621d03cde9ab70e58ed1096b890

Fix Java builds on native windows
---

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)