Now cluster Tag don't necessary need libpcre.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 2e2e89a..7ec404f 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -200,7 +200,7 @@ endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
 #--------------------------------------------------------------------------------------------------
 ### Initialize of pcre
 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 MATCH "-L${PATHLIBPCRE} " operation "${CMAKE_C_FLAGS}")
@@ -209,7 +209,7 @@ if(PATH_PCRE_LIB)
                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)")
+               message(WARNING "You should install libpcre (please install the libpcre3-dev package or equivalent)")
 endif(PATH_PCRE_LIB)
 
 #--------------------------------------------------------------------------------------------------
@@ -559,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})
@@ -630,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)")