X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/601559c5bcbc31de3d6f58786c335f0fdfabf508..36360f35fad6a78d7bcd1100ff08098eb3f1a633:/buildtools/Cmake/CompleteInFiles.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 065e67f321..7ec404f469 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -68,11 +68,16 @@ 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)
 endif(enable_tracing)
 
+if(enable_latency_bound_tracking)
+	SET(HAVE_LATENCY_BOUND_TRACKING 1)
+endif(enable_latency_bound_tracking)
+
 if(enable_model-checking AND HAVE_MMAP)
 	SET(HAVE_MC 1)
 	SET(MMALLOC_WANT_OVERIDE_LEGACY 1)
@@ -181,22 +186,30 @@ mark_as_advanced(HAVE_CGRAPH_H)
 if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
 	string(REGEX REPLACE "/libcgraph.*" "" lib_cgraph ${HAVE_CGRAPH_LIB})
 	string(REPLACE "/cgraph.h" "" file_cgraph_h ${HAVE_CGRAPH_H})
-		
 	string(REGEX MATCH "-I${file_cgraph_h} " operation "${CMAKE_C_FLAGS}")
 	if(NOT operation)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_cgraph_h} ")
 	endif(NOT operation)
+	string(REGEX MATCH "-L${lib_cgraph} " operation "${CMAKE_C_FLAGS}")
+	if(NOT operation)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${lib_cgraph} ")
+	endif(NOT operation)
 	
 endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of pcre
-find_library(PCRE_LIB pcre "/usr/lib/" )
-
+find_library(PATH_PCRE_LIB pcre "/usr/lib/")
+set(HAVE_PCRE_LIB 0)
 if(PATH_PCRE_LIB)
-       string(REGEX REPLACE "libpcre.*[.]so$" "" PATHLIBPCRE "${PCRE_LIB}")
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${PATHLIBPCRE} ")
+       string(REGEX REPLACE "/libpcre.*[.]so$" "" 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)")
 endif(PATH_PCRE_LIB)
 
 #--------------------------------------------------------------------------------------------------
@@ -546,8 +559,8 @@ set(diff_va "va_copy((d),(s))"
 "__builtin_va_copy((d),(s))"
 "do { (d) = (s)\; } while (0)"
 "do { *(d) = *(s)\; } while (0)"
-"memcpy((void *)&(d), (void *)&(s)), sizeof((s))"
-"memcpy((void *)(d), (void *)(s)), sizeof(*(s))"
+"memcpy((void *)&(d), (void *)&(s), sizeof(s))"
+"memcpy((void *)(d), (void *)(s), sizeof(*(s)))"
 )
 
 foreach(fct ${diff_va})
@@ -617,15 +630,15 @@ foreach(fct ${diff_va})
 			set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)")
 		endif(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
 
-		if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s)), sizeof((s))")
+		if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
 			set(ac_cv_va_copy "CPS")
-			set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s)), sizeof((s))")
-		endif(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s)), sizeof((s))")
+			set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
+		endif(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
 
-		if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s)), sizeof(*(s))")
+		if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
 			set(ac_cv_va_copy "CPP")
-			set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s)), sizeof(*(s))")
-		endif(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s)), sizeof(*(s))")
+			set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
+		endif(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
 				
 		if(NOT STATUS_OK)
 		set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)")
@@ -637,11 +650,10 @@ foreach(fct ${diff_va})
 endforeach(fct ${diff_va})
 
 #--------------------------------------------------------------------------------------------------
-### Try execut getline command
-try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR
+### check for getline
+try_compile(COMPILE_RESULT_VAR
 	${PROJECT_DIRECTORY}
 	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
-	OUTPUT_VARIABLE GETLINE_OUTPUT
 	)
 
 if(NOT COMPILE_RESULT_VAR)