A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement the ability to kill processes without relying on ifInterruptedStop
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
32bfee1
..
88dccf4
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-99,6
+99,7
@@
set(JMSG_JAVA_SRC
org/simgrid/msg/MsgNative.java
org/simgrid/msg/NativeException.java
org/simgrid/msg/Process.java
org/simgrid/msg/MsgNative.java
org/simgrid/msg/NativeException.java
org/simgrid/msg/Process.java
+ org/simgrid/msg/ProcessKilled.java
org/simgrid/msg/ProcessNotFoundException.java
org/simgrid/msg/Sem.java
org/simgrid/msg/Task.java
org/simgrid/msg/ProcessNotFoundException.java
org/simgrid/msg/Sem.java
org/simgrid/msg/Task.java
@@
-202,7
+203,7
@@
if(WIN32)
endif(PEXPORTS_PATH)
else(WIN32)
target_link_libraries(SG_java pcre pthread simgrid)
endif(PEXPORTS_PATH)
else(WIN32)
target_link_libraries(SG_java pcre pthread simgrid)
- set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+ set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB
_PATH
} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
endif(WIN32)
# java_classes
endif(WIN32)
# java_classes
@@
-289,10
+290,10
@@
set(test_list basic async pingPong CommTime mutualExclusion bypass kill)
if(APPLE)
if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
if(APPLE)
if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
- PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+ PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
- PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+ PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
endif(APPLE)
endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
endif(APPLE)
@@
-302,10
+303,10
@@
endif(APPLE)
if(NOT WIN32)
if($ENV{LD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
if(NOT WIN32)
if($ENV{LD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
- PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+ PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
else($ENV{LD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
else($ENV{LD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
- PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+ PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
endif(NOT WIN32)
endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
endif(NOT WIN32)