Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fix Java builds on native windows
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Sun, 2 Jan 2022 23:53:09 +0000 (00:53 +0100)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Sun, 2 Jan 2022 23:53:09 +0000 (00:53 +0100)
examples/deprecated/java/CMakeLists.txt

index afcdd52..64ae09a 100644 (file)
@@ -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)