Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add sources for distrib.
[simgrid.git] / buildtools / Cmake / src / CMakeMakeExeLib.txt
index 0e88a61..cceeba2 100644 (file)
@@ -135,19 +135,15 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 if(HAVE_JAVA)
+       foreach(file ${JMSG_JAVA_SRC})
+               set(java_src_to_compile "${java_src_to_compile} ${file}")       
+       endforeach(file ${JMSG_JAVA_SRC})
 
-       add_custom_command(TARGET simgrid
-       POST_BUILD
-       COMMAND echo "[  0%] Building JAR object src/simgrid.jar"
+       add_custom_target(simgrid.jar   ALL
        COMMAND /bin/sh ${PROJECT_DIRECTORY}/make_simgrid_java.sh
-       COMMAND echo "[100%] Building JAR object src/simgrid.jar"
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
        )
 
-       foreach(file ${JMSG_JAVA_SRC})
-               set(java_src_to_compile "${java_src_to_compile} ${file}")       
-       endforeach(file ${JMSG_JAVA_SRC})
-
 file(WRITE     ${PROJECT_DIRECTORY}/make_simgrid_java.sh 
 "\#! /bin/sh\n\n")
 
@@ -165,9 +161,6 @@ file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/s
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes . &>/dev/null\n")
 
-file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "echo \"[ 50%] Building JAR object src/simgrid.jar\"\n")
-
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${PROJECT_DIRECTORY}/examples/java/basic/*.class\n")
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java\n")