X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d9136dcefea8e3dfa3dc18eac9d9c2eb479a49e..8f7873c57495707ccbdad488eab21356bf5496d7:/buildtools/Cmake/MakeExeLib.cmake

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 99fd1e0a75..38c5134c58 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -1,20 +1,24 @@
 ### Make Libs
+include(FindSupernovae)
 
-if(enable_supernovae)
+if(enable_supernovae AND HAVE_SUPERNOVAE_TOOLS)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
-else(enable_supernovae)	
+else(enable_supernovae AND HAVE_SUPERNOVAE_TOOLS)	
 	add_library(simgrid SHARED ${simgrid_sources})
-	add_library(simgrid_static STATIC ${simgrid_sources})
 	add_library(gras SHARED ${gras_sources})
+	if(enable_lib_static)
+		add_library(simgrid_static STATIC ${simgrid_sources})	
+	endif(enable_lib_static)
 	if(enable_smpi)
 		add_library(smpi SHARED ${SMPI_SRC})
-		add_library(smpi_static STATIC ${SMPI_SRC})
+		if(enable_lib_static)
+			add_library(smpi_static STATIC ${SMPI_SRC})	
+		endif(enable_lib_static)
 	endif(enable_smpi)
-endif(enable_supernovae)
+endif(enable_supernovae AND HAVE_SUPERNOVAE_TOOLS)
 
 set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 set_target_properties(gras PROPERTIES VERSION ${libgras_version})
-
 if(enable_smpi)
 	set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
 endif(enable_smpi)
@@ -22,6 +26,9 @@ endif(enable_smpi)
 set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
+if(APPLE)
+    set(SMPI_DEP "-Wl,-U -Wl,_smpi_simulated_main")
+endif(APPLE)
 
 if(HAVE_PCRE_LIB)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")
@@ -30,11 +37,13 @@ endif(HAVE_PCRE_LIB)
 if(HAVE_RUBY)
 	set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -module")
 	ADD_CUSTOM_TARGET(link_simgrid_ruby ALL
-	  DEPENDS simgrid
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so
-	  COMMENT "Generating libsimgrid.so link for binding ruby..."
+	  DEPENDS simgrid ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
 	  )
-	
+	add_custom_command(
+		OUTPUT ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
+	        COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
+	)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -52,21 +61,40 @@ if(pthread)
 endif(pthread)
 
 if(HAVE_LUA)
-	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")   
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${LIB_LUA_NAME}")   
 	  
     ADD_CUSTOM_TARGET(link_simgrid_lua ALL
-      DEPENDS simgrid
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so #for test
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.so #for test
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/simdag/simgrid.so #for test
-	  COMMENT "Generating libsimgrid.so link for binding lua..."
+      DEPENDS 	simgrid
+      			${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE}
+	)
+	add_custom_command(
+		OUTPUT 	${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE}
+		COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} #for test
+		
+		COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+	  	COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test
+		
+		COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+	  	COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} #for test			
 	)
-	
 endif(HAVE_LUA)
 
-if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
-	SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
-endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
+if(HAVE_GRAPHVIZ)
+
+    if(HAVE_CGRAPH_LIB)
+	    SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
+	else(HAVE_CGRAPH_LIB)
+        if(HAVE_AGRAPH_LIB)
+    	    SET(SIMGRID_DEP "${SIMGRID_DEP} -lagraph -lcdt")
+        endif(HAVE_AGRAPH_LIB)	
+    endif(HAVE_CGRAPH_LIB)
+    	    
+endif(HAVE_GRAPHVIZ)
 
 if(HAVE_GTNETS)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
@@ -78,18 +106,23 @@ if(HAVE_POSIX_GETTIME)
 endif(HAVE_POSIX_GETTIME)
 
 target_link_libraries(simgrid 	${SIMGRID_DEP})
-target_link_libraries(simgrid_static	${SIMGRID_DEP})
 target_link_libraries(gras 	${GRAS_DEP})
-
 add_dependencies(gras maintainer_files)
-add_dependencies(simgrid maintainer_files)
-add_dependencies(simgrid_static maintainer_files)
-				
+add_dependencies(simgrid maintainer_files)				
 if(enable_smpi)
 	target_link_libraries(smpi 	simgrid ${SMPI_DEP})
-	target_link_libraries(smpi_static simgrid ${SMPI_DEP})
 endif(enable_smpi)
 
+if(enable_lib_static)
+	target_link_libraries(simgrid_static 	${SIMGRID_DEP})
+	add_dependencies(simgrid_static maintainer_files)
+	set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid)
+	if(enable_smpi)
+		target_link_libraries(smpi_static 	simgrid ${SMPI_DEP})
+		set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
+	endif(enable_smpi)
+endif(enable_lib_static)
+
 ### Make EXEs
 
 #src/testall
@@ -164,9 +197,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)
 
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
-if(HAVE_CGRAPH_H)
-add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
-endif(HAVE_CGRAPH_H)
+if(HAVE_GRAPHVIZ)
+  add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
+endif(HAVE_GRAPHVIZ)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling)