always set latency_bound_tracking to on when gtnets is enabled

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 98dd83f..ad724e0 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -70,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)
@@ -78,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)
@@ -204,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)
 
 #--------------------------------------------------------------------------------------------------