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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84080cb7bb..6b3c5d3f7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,8 @@ set(JMSG_C_SRC
 	src/jmsg_task.h
 	src/jmsg_synchro.c
 	src/jmsg_synchro.h
+	src/jtrace.c
+	src/jtrace.h
 )
 
 set(JMSG_JAVA_SRC
@@ -107,6 +109,7 @@ set(JMSG_JAVA_SRC
 	org/simgrid/msg/TransferFailureException.java	
 	org/simgrid/msg/Mutex.java
 	org/simgrid/msg/Comm.java
+	org/simgrid/trace/Trace.java
 )
 
 set(JAVA_EXAMPLES
@@ -215,9 +218,25 @@ if(WIN32)
     endif(PEXPORTS_PATH)
 else(WIN32)
     target_link_libraries(SG_java pcre pthread simgrid)
-    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
 endif(WIN32)
 
+# SG_java_tracing
+add_library(SG_java_tracing SHARED ${JMSG_C_SRC})
+if(WIN32)
+    set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at ${SIMGRID_LIB}" PREFIX "")
+    find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
+    message(STATUS "pexports: ${PEXPORTS_PATH}")
+    if(PEXPORTS_PATH)
+    add_custom_command(TARGET SG_java_tracing POST_BUILD
+    COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java_tracing.dll > ${CMAKE_BINARY_DIR}/SG_java_tracing.def)
+    endif(PEXPORTS_PATH)
+else(WIN32)
+    target_link_libraries(SG_java_tracing pcre pthread simgrid)
+    set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
+endif(WIN32)
+
+
 # java_classes
 add_custom_command(
 	OUTPUT 	${JMSG_JAVA_SRC_CLASS}
@@ -262,7 +281,7 @@ add_custom_target(simgrid_java_examples ALL
 # Declare dependencies #
 ########################
 add_dependencies(simgrid_jar java_classes)
-add_dependencies(simgrid_java_examples simgrid_jar SG_java)
+add_dependencies(simgrid_java_examples simgrid_jar SG_java_tracing SG_java)
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
 ${CMAKE_HOME_DIRECTORY}/simgrid.jar
@@ -289,33 +308,32 @@ set(test_list basic async pingPong CommTime mutualExclusion bypass kill startKil
 # Set the  DYLD_LIBRARY_PATH for mac     #
 ##########################################
 if(APPLE)
-    if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
+    if($ENV{DYLD_LIBRARY_PATH})
         set_tests_properties(${test_list}
         PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
-    else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
+    else($ENV{DYLD_LIBRARY_PATH})
         set_tests_properties(${test_list}
         PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
-    endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
-
-elseif(APPLE)
+    endif($ENV{DYLD_LIBRARY_PATH})
+else(APPLE)
     ##########################################
     # Set the  LD_LIBRARY_PATH for our tests #
     ##########################################
     if(NOT WIN32)
-        if($ENV{LD_LIBRARY_PATH} STREQUAL "")
+        if($ENV{LD_LIBRARY_PATH})
             set_tests_properties(${test_list}
             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
-        else($ENV{LD_LIBRARY_PATH} STREQUAL "")
+        else($ENV{LD_LIBRARY_PATH})
             set_tests_properties(${test_list}
             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
-        endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
+        endif($ENV{LD_LIBRARY_PATH})
     endif(NOT WIN32)
 endif(APPLE)
 
 ###########
 # Install #
 ###########
-install(TARGETS SG_java
+install(TARGETS SG_java SG_java_tracing
 	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
 install(FILES ${CMAKE_HOME_DIRECTORY}/simgrid.jar
 	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)