Fix pcre path.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8284 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index f7f8daf..416d1da 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -197,12 +197,14 @@ endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
 find_library(PATH_PCRE_LIB pcre "/usr/lib/")
 
 if(PATH_PCRE_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)
                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 "Must have libpcre")

 endif(PATH_PCRE_LIB)
 
 #--------------------------------------------------------------------------------------------------
 endif(PATH_PCRE_LIB)
 
 #--------------------------------------------------------------------------------------------------

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 2a7c638..302eea3 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -54,7 +54,7 @@ if(enable_supernovae AND enable_model-checking)
        set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
        message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
 endif(enable_supernovae AND enable_model-checking)
        set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
        message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
 endif(enable_supernovae AND enable_model-checking)

-
+mark_as_advanced(PATH_PCRE_LIB)

 mark_as_advanced(HAVE_SSH)
 mark_as_advanced(HAVE_RSYNC)
 mark_as_advanced(enable_coverage)
 mark_as_advanced(HAVE_SSH)
 mark_as_advanced(HAVE_RSYNC)
 mark_as_advanced(enable_coverage)

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 167bdcf..744a3b8 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -139,7 +139,7 @@ if(enable_print_message)
        endif(pipol_user)
        if(HAVE_PCRE_LIB)
        message("")
        endif(pipol_user)
        if(HAVE_PCRE_LIB)
        message("")

-    message("LIBPCRE : ${PCRE_LIB}")
+    message("LIBPCRE : ${PATH_PCRE_LIB}")

     message("PATH_LIBPCRE : ${PATHLIBPCRE}")
        endif(HAVE_PCRE_LIB)
        message("________________________________________________________________________________")
     message("PATH_LIBPCRE : ${PATHLIBPCRE}")
        endif(HAVE_PCRE_LIB)
        message("________________________________________________________________________________")