X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8ace613433496e0e5219469472d6bf584b7db86..fa73197ac740922fc74b7940d5516b4b3e49ee55:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff7ce529e0..2b631904f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,11 @@ set(JAVA_EXAMPLES
 	examples/master_slave_bypass/Master.java
 	examples/master_slave_bypass/MsBypass.java
 	examples/master_slave_bypass/Slave.java
+	examples/master_slave_bypass/FinalizeTask.java
+	examples/master_slave_kill/Master.java
+	examples/master_slave_kill/MsKill.java
+	examples/master_slave_kill/Slave.java
+	examples/master_slave_kill/FinalizeTask.java
 )
 
 set(CMAKE_SRC
@@ -148,6 +153,7 @@ set(XML_FILES
     examples/basic/basicDeployment.xml
     examples/basic/deploy.xml
     examples/master_slave_bypass/platform.xml
+    examples/master_slave_kill/platform.xml
 )
 
 set(source_to_pack
@@ -168,9 +174,9 @@ string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}")
 # FLAGS #
 #########
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
-set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$ENV{SIMGRID_ROOT}/include -I$ENV{SIMGRID_ROOT}/src -I$ENV{SIMGRID_ROOT}/src/include")
+set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I${SIMGRID_INCLUDES}")
 set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH} -DMSG_USE_DEPRECATED")
 
 if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-but-set-variable ")
@@ -215,7 +221,9 @@ add_custom_command(
   	COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java
   	COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java              			
 	COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java
+	COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java
 )
+
 add_custom_target(simgrid_java_examples ALL
 	DEPENDS ${JAVA_EXAMPLES_CLASS}
 )
@@ -251,17 +259,21 @@ java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar
 ADD_TEST(bypass
 java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_bypass/MsBypass ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/platform.xml
 )
-
+ADD_TEST(kill
+java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_kill/MsKill ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/platform.xml
+)
+#Don't forget to put new test in this list!!!
+set(test_list basic pingPong CommTime mutualExclusion bypass kill)
 
 ##########################################
 # Set the  DYLD_LIBRARY_PATH for mac     #
 ##########################################
 if(APPLE)
     if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
-        set_tests_properties(basic pingPong CommTime mutualExclusion
+        set_tests_properties(${test_list}
         PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
     else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
-        set_tests_properties(basic pingPong CommTime mutualExclusion
+        set_tests_properties(${test_list}
         PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
     endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
 endif(APPLE)
@@ -270,10 +282,10 @@ endif(APPLE)
 # Set the  LD_LIBRARY_PATH for our tests #
 ##########################################
 if($ENV{LD_LIBRARY_PATH} STREQUAL "")
-    set_tests_properties(basic pingPong CommTime mutualExclusion
+    set_tests_properties(${test_list}
     PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
 else($ENV{LD_LIBRARY_PATH} STREQUAL "")
-    set_tests_properties(basic pingPong CommTime mutualExclusion
+    set_tests_properties(${test_list}
     PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
 endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
 
@@ -341,4 +353,11 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Testing/Notes/)
 file(WRITE ${CMAKE_BINARY_DIR}/Testing/Notes/Build  "GIT version : ${GIT_VERSION}\n")
 file(APPEND ${CMAKE_BINARY_DIR}/Testing/Notes/Build "Release     : ${DIST_NAME}\n")
 file(APPEND ${CMAKE_BINARY_DIR}/Testing/Notes/Build "Pipol user  : $ENV{PIPOL_USER}\n")
-file(APPEND ${CMAKE_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")
\ No newline at end of file
+file(APPEND ${CMAKE_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")
+
+#######
+# DOC #
+#######
+set(WARNING "This file is generated, don't edit it!")
+set(srcdir ${CMAKE_HOME_DIRECTORY})
+include(GenerateDoc.cmake)