X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a995c7469b31d62d38a7463e0ca2b97c66824a94..2bafc9e47b08a780d3e0d57580404cfda3f17095:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 3d978c282b..ad724e068c 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -57,9 +57,11 @@ CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
 
-if(WIN32)
+if(WIN32) #THOSE FILES ARE FUNCTIONS ARE NOT DETECTED BUT THEY SHOULD...
     set(HAVE_UCONTEXT_H 1)
     set(HAVE_MAKECONTEXT 1)
+    set(HAVE_SNPRINTF 1)
+    set(HAVE_VSNPRINTF 1)
 endif(WIN32)
 
 set(CONTEXT_UCONTEXT 0)
@@ -68,7 +70,6 @@ SET(HAVE_RUBY 0)
 set(HAVE_LUA 0)
 SET(HAVE_JAVA 0)
 SET(HAVE_TRACING 0)
-SET(HAVE_LATENCY_BOUND_TRACKING 0)
 
 if(enable_tracing)
 	SET(HAVE_TRACING 1)
@@ -76,6 +77,13 @@ endif(enable_tracing)
 
 if(enable_latency_bound_tracking)
 	SET(HAVE_LATENCY_BOUND_TRACKING 1)
+else(enable_latency_bound_tracking)
+  if(enable_gtnets)
+    SET(enable_latency_bound_tracking ON)
+    SET(HAVE_LATENCY_BOUND_TRACKING 1)
+  else(enable_gtnets)
+    SET(HAVE_LATENCY_BOUND_TRACKING 0)
+  endif(enable_gtnets)
 endif(enable_latency_bound_tracking)
 
 if(enable_model-checking AND HAVE_MMAP)
@@ -202,14 +210,14 @@ endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
 find_library(PATH_PCRE_LIB pcre "/usr/lib/")
 set(HAVE_PCRE_LIB 0)
 if(PATH_PCRE_LIB)
-       string(REGEX REPLACE "/libpcre.*[.]so$" "" PATHLIBPCRE "${PATH_PCRE_LIB}")
+       string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATHLIBPCRE "${PATH_PCRE_LIB}")
        	string(REGEX MATCH "-L${PATHLIBPCRE} " operation "${CMAKE_C_FLAGS}")
 		if(NOT operation)
 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${PATHLIBPCRE} ")
 		endif(NOT operation)
        set(HAVE_PCRE_LIB 1)
 else(PATH_PCRE_LIB)
-		message(WARNING "You should install libpcre (please install the libpcre3-dev package or equivalent)")
+		message("You should install libpcre (please install the libpcre3-dev package or equivalent)")
 endif(PATH_PCRE_LIB)
 
 #--------------------------------------------------------------------------------------------------
@@ -665,8 +673,12 @@ SET(SIMGRID_NEED_GETLINE 0)
 endif(NOT COMPILE_RESULT_VAR)
 
 ### check for a working snprintf
-if(HAVE_SNPRINTF AND HAVE_VSNPRINTF)
-
+if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
+    if(WIN32)
+        #set(HAVE_SNPRINTF 1)
+        #set(HAVE_VSNPRINTF 1)
+    endif(WIN32)
+    
 	try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
 		${PROJECT_DIRECTORY}
 		${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
@@ -689,7 +701,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF)
 	if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
 		set(PREFER_PORTABLE_SNPRINTF 1)
 	endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
-endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF)
+endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
 
 ### check for asprintf function familly
 if(HAVE_ASPRINTF)