X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15badc71ce964f6dae6428c9a4c0198fad5d4936..8d000a773b5ebcd411b28c31de68eeddf804e66b:/examples/scala/masterslave/CMakeLists.txt diff --git a/examples/scala/masterslave/CMakeLists.txt b/examples/scala/masterslave/CMakeLists.txt index 54b10294bf..b81f30c5ac 100644 --- a/examples/scala/masterslave/CMakeLists.txt +++ b/examples/scala/masterslave/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.6) - set(example scala_masterslave) set(sources ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.scala @@ -13,8 +11,8 @@ if(enable_scala) add_custom_command( COMMENT "Building ${example}..." OUTPUT ${example}_compiled - DEPENDS ${sources} SG_java_jar ${SIMGRID_JAR} - COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} + DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} + COMMAND ${SCALA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled @@ -29,7 +27,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml PARENT_SCOPE )