X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f583eea12f82640c644ef6e50c1c4d1ff28fd6ab..50251351a088dbf719dc4890d515077952cfbd76:/buildtools/Cmake/src/CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 2ea55489f6..50d462e604 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -1,23 +1,23 @@
 ### Make Libs
 
-if(supernovae)
+if(enable_supernovae)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeSupernovae.txt)
-else(supernovae)	
+else(enable_supernovae)	
 	add_library(simgrid SHARED ${simgrid_sources})
 	add_library(simgrid_static STATIC ${simgrid_sources})
 	add_library(gras SHARED ${gras_sources})
 	add_library(smpi STATIC ${SMPI_SRC})
-endif(supernovae)
+endif(enable_supernovae)
 
 set(GRAS_DEP "pthread")
 set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
-if(HAVE_RUBY_H)
-	add_library(simgrid_ruby STATIC ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
+if(HAVE_RUBY)
+	add_library(simgrid_ruby SHARED ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
 	set(RUBY_DEP "-lm -module")
 	target_link_libraries(simgrid_ruby 	simgrid ${RUBY_DEP} -fprofile-arcs)
-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions("-D_XOPEN_SOURCE")
@@ -47,10 +47,10 @@ if(HAVE_POSIX_GETTIME)
 	SET(GRAS_DEP "${GRAS_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)
 
-if(NOT HAVE_RUBY_H)
+if(NOT HAVE_RUBY)
 	string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
 	string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
-endif(NOT HAVE_RUBY_H)
+endif(NOT HAVE_RUBY)
 
 target_link_libraries(simgrid 	${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static	${SIMGRID_DEP} -fprofile-arcs)
@@ -63,6 +63,11 @@ target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
+if(enable_maintainer_mode)
+#src
+add_subdirectory(${PROJECT_DIRECTORY}/src)
+endif(enable_maintainer_mode)
+
 #tools
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)