X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53c574844a785bc0437165692ded76080b30f7ab..28a5837a99b69c35fec98a0d60d3d8bebd9c9221:/buildtools/Cmake/CompleteInFiles.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 77b1af5835..2e2e89a259 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)
@@ -194,15 +199,17 @@ 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/")
 
 if(PATH_PCRE_LIB)
-       string(REGEX REPLACE "/libpcre.*[.]so$" "" PATHLIBPCRE "${PCRE_LIB}")
+       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(FATAL_ERROR "You must have libpcre installed (please install the libpcre3-dev package or equivalent)")
 endif(PATH_PCRE_LIB)
 
 #--------------------------------------------------------------------------------------------------
@@ -643,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)