Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
pthreads are not used anymore. Standard C++ ones are
[simgrid.git] / teshsuite / java / CMakeLists.txt
index c6dcb7a..bd5d5b1 100644 (file)
@@ -11,12 +11,12 @@ foreach(example semaphoregc sleephostoff)
   if(enable_java)
     string (REPLACE "-" "/" example_dir ${example})
     add_jar(java-${example} SOURCES ${sources}
-            INCLUDE_JARS ${SIMGRID_JAR}
-           OUTPUT_NAME ${example}
-           OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${example_dir})
+            INCLUDE_JARS simgrid-java_jar
+            OUTPUT_NAME ${example}
+            OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${example_dir})
     add_dependencies(java-all java-${example})
-    
-    ADD_TESH(tesh-java-${example}  --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${TESH_LIBRARY_PATH} --setenv classpath=${TESH_CLASSPATH}:${example}.jar --cd ${CMAKE_BINARY_DIR}/teshsuite/java/${example_dir}  ${CMAKE_HOME_DIRECTORY}/teshsuite/java/${example_dir}/${example}.tesh)
+
+    ADD_TESH(tesh-java-${example}  --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${TESH_LIBRARY_PATH} --setenv classpath=${TESH_CLASSPATH}${TESH_CLASSPATH_SEPARATOR}${example}.jar --cd ${CMAKE_BINARY_DIR}/teshsuite/java/${example_dir}  ${CMAKE_HOME_DIRECTORY}/teshsuite/java/${example_dir}/${example}.tesh)
   endif()
   set(examples_src ${examples_src} ${sources})
 endforeach()