X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01229eb154b0c1264a6406b673e8ed18126da812..3d89e90c0308155d5309f8f7e7cfa4e716242570:/buildtools/Cmake/MakeLib.cmake

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index a1fb29c823..9bc0d11731 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -1,11 +1,5 @@
 ### Make Libs
 
-
-# Try to make Mac a bit more complient to open source standards
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-	add_definitions("-D_XOPEN_SOURCE")
-endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-
 ###############################
 # Declare the library content #
 ###############################
@@ -53,7 +47,7 @@ endif(enable_supernovae)
 
 # Compute the dependencies of GRAS
 ##################################
-set(GRAS_DEP "-lm -lpthread")
+set(GRAS_DEP "-lm -pthread")
 
 if(HAVE_POSIX_GETTIME)
 	SET(GRAS_DEP "${GRAS_DEP} -lrt")
@@ -72,27 +66,11 @@ target_link_libraries(gras 	${GRAS_DEP})
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm")
-if(HAVE_PCRE_LIB)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")
-endif(HAVE_PCRE_LIB)
-
-if(HAVE_RUBY)
-	set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME}")
-	ADD_CUSTOM_TARGET(link_simgrid_ruby ALL
-		 DEPENDS simgrid ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE}
-	)
-	add_custom_command(
-		OUTPUT ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE}
-	        COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
-			COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/src/bindings/ruby/
-			COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/src/bindings/ruby/libsimgrid.${LIB_EXE}
-	)
-endif(HAVE_RUBY)
+set(SIMGRID_DEP "-lm -lpcre")
 
 if(pthread)
 	if(${CONTEXT_THREADS})
-		SET(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
+		SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
 	endif(${CONTEXT_THREADS})	
 endif(pthread)
 
@@ -119,7 +97,7 @@ if(HAVE_LUA)
 	  	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/
 	  	COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test			
 	)
-	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${LIB_LUA_NAME}")   	  
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_LUA_NAME}")   	  
 endif(HAVE_LUA)
 
 if(HAVE_GRAPHVIZ)
@@ -136,6 +114,16 @@ if(HAVE_GTNETS)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
+if(HAVE_NS3)
+    if(${NS3_VERSION} EQUAL 310)
+	    SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3")
+	    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_NS3_3_10")
+	    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_NS3_3_10")
+	else(${NS3_VERSION} EQUAL 310)
+	    SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point -lns3-internet -lns3-applications")
+	endif(${NS3_VERSION} EQUAL 310)
+endif(HAVE_NS3)
+
 if(HAVE_POSIX_GETTIME)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)