X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ba32e9e4cbb147b495d1c59711463c0b28c8a79..3a42d7a9a23f7eeeb8448083ccd8d3da9a69197c:/buildtools/Cmake/MakeExeLib.cmake

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 9bd1c38d2c..10c9e318ce 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -4,16 +4,20 @@ if(enable_supernovae)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
 else(enable_supernovae)	
 	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})
+		if(enable_lib_static)
+			add_library(smpi_static STATIC ${SMPI_SRC})	
+		endif(enable_lib_static)
 	endif(enable_smpi)
 endif(enable_supernovae)
 
 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,15 +26,20 @@ set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
+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} -module")
-	ADD_CUSTOM_COMMAND(
-	  OUTPUT ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so
-	  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..."
-	)
 	ADD_CUSTOM_TARGET(link_simgrid_ruby ALL
-	                  DEPENDS simgrid ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so)
+	  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")
@@ -48,22 +57,27 @@ if(pthread)
 endif(pthread)
 
 if(HAVE_LUA)
-	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")      
-    ADD_CUSTOM_COMMAND(
-	  OUTPUT ${PROJECT_DIRECTORY}/examples/lua/simgrid.so 
-	  OUTPUT ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.so
-	  OUTPUT ${PROJECT_DIRECTORY}/examples/simdag/simgrid.so
-	  OUTPUT ${PROJECT_DIRECTOTY}/examples/gras/console/simgrid.so
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.so 
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/simdag/simgrid.so 
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.so ${PROJECT_DIRECTORY}/examples/gras/console/simgrid.so
-	  COMMENT "Generating libsimgrid.so link for binding lua..."
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")   
+	  
+    ADD_CUSTOM_TARGET(link_simgrid_lua ALL
+      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			
 	)
-
-	ADD_CUSTOM_TARGET(link_simgrid_lua ALL
-	                  DEPENDS simgrid ${PROJECT_DIRECTORY}/examples/lua/simgrid.so)
-
 endif(HAVE_LUA)
 
 if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
@@ -80,17 +94,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})
 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