From df6427f7c2af0b679c5b980d508a02e0068e734c Mon Sep 17 00:00:00 2001 From: navarro Date: Tue, 12 Jun 2012 23:05:06 +0200 Subject: [PATCH] Clean generated file class. --- CMakeLists.txt | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82124fb896..ea2ccb78d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ endif(WIN32) # java_classes add_custom_command( - OUTPUT ${JMSG_JAVA_SRC_CLASS} + OUTPUT ${JMSG_JAVA_SRC_CLASS} DEPENDS ${JMSG_JAVA_SRC} COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_HOME_DIRECTORY}/classes/" COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/classes/ @@ -259,10 +259,6 @@ add_custom_command( add_custom_target(java_classes ALL DEPENDS ${JMSG_JAVA_SRC_CLASS} ) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - ${JMSG_JAVA_SRC_CLASS} -) - # simgrid_jar add_custom_target(simgrid_jar ALL @@ -272,6 +268,16 @@ add_custom_target(simgrid_jar ALL ) # simgrid_java_examples +set(JAVA_EXAMPLES_CLASS + ${JAVA_EXAMPLES_CLASS} + ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/MessageTask$Type.class + ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Peer$1.class + ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/TrackerTask$Type.class + ${CMAKE_HOME_DIRECTORY}/examples/chord/GetPredecessorTask.class + ${CMAKE_HOME_DIRECTORY}/examples/priority/Test.class + ${CMAKE_HOME_DIRECTORY}/examples/priority/Priority.class +) + add_custom_command( COMMENT "Build examples for java" OUTPUT ${JAVA_EXAMPLES_CLASS} @@ -301,10 +307,6 @@ add_custom_target(simgrid_java_examples ALL add_dependencies(simgrid_jar java_classes) add_dependencies(simgrid_java_examples simgrid_jar SG_java) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - ${CMAKE_HOME_DIRECTORY}/simgrid.jar -) - ##################### # Declare our tests # ##################### @@ -410,6 +412,13 @@ add_custom_command( ) add_dependencies(dist dist-dir) +########################## +# Extra make clean files # +########################## +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES + ${CMAKE_HOME_DIRECTORY}/simgrid.jar +) + ######## # NOTE # ######## -- 2.20.1