X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f583eea12f82640c644ef6e50c1c4d1ff28fd6ab..323c04336e038c329cbbc35733fe7fa1333374f8:/buildtools/Cmake/src/CMakeCompleteInFiles.txt?ds=sidebyside

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index c86b24592d..3b333b057f 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -17,7 +17,6 @@ CHECK_LIBRARY_EXISTS(rt 	clock_gettime 		NO_DEFAULT_PATHS HAVE_POSIX_GETTIME)
 CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H)
-CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
 CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H)
 CHECK_INCLUDE_FILE(socket.h HAVE_SOCKET_H)
 CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H)
@@ -54,7 +53,7 @@ CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
-SET(HAVE_RUBY_H 0)
+SET(HAVE_RUBY 0)
 set(libruby "ruby1.8")
 if(NOT disable_ruby)
 	include(FindRuby)
@@ -80,10 +79,14 @@ if(NOT disable_ruby)
 		
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_INCLUDE_PATH} -fPIC ")
 		ADD_DEFINITIONS("-I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
-		SET(HAVE_RUBY_H 1)
+		SET(HAVE_RUBY 1)
 	endif(RUBY_INCLUDE_PATH)
 endif(NOT disable_ruby)
 
+if(tracing)
+	SET(HAVE_TRACING 1)
+endif(tracing)
+
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
 if(disable_java)
@@ -128,12 +131,12 @@ endif(disable_gtnets)
 ### Initialize of CONTEXT THREADS
 
 if(pthread)
-set(pthread "yes")
+set(pthread 1)
 elseif(pthread)
-set(pthread "no")
+set(pthread 0)
 endif(pthread)
 
-if(pthread MATCHES "yes")
+if(pthread)
 	### HAVE_SEM_INIT
   	
   	if(HAVE_SEM_INIT_LIB)
@@ -166,7 +169,7 @@ if(pthread MATCHES "yes")
 			set(HAVE_MUTEX_TIMEDLOCK 1)
 		endif(HAVE_MUTEX_TIMEDLOCK_run)
 	endif(HAVE_MUTEX_TIMEDLOCK_LIB)
-endif(pthread MATCHES "yes")
+endif(pthread)
 
 # AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
 set(mcsc_flags "")
@@ -186,14 +189,14 @@ elseif(mcsc MATCHES "yes")
 	set(mcsc "no")
 endif(mcsc MATCHES "yes")
 
-if(mcsc MATCHES "no" AND pthread MATCHES "no")
+if(mcsc MATCHES "no" AND pthread)
 	if(HAVE_WINDOWS_H)
 		set(windows_context "yes")
 		set(IS_WINDOWS 1)
 	elseif(HAVE_WINDOWS_H)
 		message(FATAL_ERROR "no appropriate backend found")
 	endif(HAVE_WINDOWS_H)
-endif(mcsc MATCHES "no" AND pthread MATCHES "no")
+endif(mcsc MATCHES "no" AND pthread)
 
 if(with_context MATCHES "ucontext" AND mcsc MATCHES "no")
 	message(FATAL_ERROR "-Dwith-context=ucontext specified but ucontext unusable.")
@@ -235,9 +238,9 @@ endif(with_context MATCHES "ucontext")
 
 if(with_context MATCHES "pthread")
 	set(with_context_ok 1)
-	if(pthread MATCHES "no")
+	if(NOT pthread)
 		message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).")
-	endif(pthread MATCHES "no")
+	endif(NOT pthread)
 	SET(CONTEXT_THREADS 1)
 endif(with_context MATCHES "pthread")
 
@@ -647,6 +650,8 @@ SET( CMAKEDEFINE "#cmakedefine" )
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" "${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${PROJECT_DIRECTORY}/include/simgrid_config.h)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_tracing_config.h.in" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_tracing_config.h.in" "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 if(NOT prefix)
 	set(prefix /usr/local)