From: Navarrop <Pierre.Navarro@imag.fr>
Date: Mon, 11 Apr 2011 08:45:15 +0000 (+0200)
Subject: Set enable_pcre to auto by default.
X-Git-Tag: v3.6_beta2~59^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9542feb75e0699f61b74935446dfed3991e45fa6

Set enable_pcre to auto by default.
Configure failed if set to "on" and if pcre is not found.
---

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 43a8707265..4f801ebb7d 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -14,9 +14,11 @@ include(TestBigEndian)
 TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
-if(enable_pcre)
+
+string(TOUPPER ${enable_pcre} enable_pcre)
+if(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
 include(FindPCRE)
-endif(enable_pcre)
+endif(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
 if(enable_gtnets)	
 	include(FindGTnets)
 endif(enable_gtnets)
diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 45eddfe299..d57c59e7e1 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -24,6 +24,21 @@ find_path(PATH_PCRE_H "pcre.h"
     /usr)
     
 set(HAVE_PCRE_LIB 0)
+
+message(STATUS "Looking for pcre.h")
+if(PATH_PCRE_H)
+message(STATUS "Looking for pcre.h - found")
+else(PATH_PCRE_H)
+message(STATUS "Looking for pcre.h - not found")
+endif(PATH_PCRE_H)
+
+message(STATUS "Looking for lib pcre")
+if(PATH_PCRE_LIB)
+message(STATUS "Looking for lib pcre - found")
+else(PATH_PCRE_LIB)
+message(STATUS "Looking for lib pcre - not found")
+endif(PATH_PCRE_LIB)
+
 if(PATH_PCRE_LIB AND PATH_PCRE_H)
        string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATHLIBPCRE "${PATH_PCRE_LIB}")
        string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
@@ -37,22 +52,12 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H)
 	   endif(NOT operation)	   
        set(HAVE_PCRE_LIB 1)
 else(PATH_PCRE_LIB)
-		message(STATUS "Warning : You should install libpcre (please install the libpcre3-dev package or equivalent)")
+		if(enable_pcre STREQUAL "ON")
+			message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using it.")
+		else(enable_pcre STREQUAL "ON")
+			message(STATUS "Warning: You should install libpcre (please install the libpcre3-dev package or equivalent).")
+		endif(enable_pcre STREQUAL "ON")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
     
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - found")
-else(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - not found")
-endif(PATH_PCRE_H)
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - found")
-else(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - not found")
-endif(PATH_PCRE_LIB)
-
 mark_as_advanced(PATH_PCRE_H)
 mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 60e1b0946d..bd58b59107 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -18,7 +18,10 @@ set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
 option(enable_gtnets "Whether gtnets model is activated." on)
 option(enable_smpi "This variable set smpi lib." on)
 option(enable_lua "Whether the lua bindings are activated." on)
-option(enable_pcre "Whether the pcre lib is activated." on) 
+set(enable_pcre ${enable_pcre} CACHE FORCE "Whether the pcre lib is activated.")
+if(enable_pcre STREQUAL "")
+	set(enable_pcre "AUTO")
+endif(enable_pcre STREQUAL "")
 
 if(WIN32 OR APPLE) 
 set(enable_smpi off CACHE TYPE INTERNAL FORCE)
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 4f626b4ec2..613d96a4a8 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -94,6 +94,7 @@ endif(NOT APPLE AND NOT WIN32)
 message("	Compile Lua    :    	${HAVE_LUA}")
 message("	Compile Smpi   :    	${enable_smpi}")
 message("	Compile Static :    	${enable_lib_static}")
+message("	Compile pcre   :    	${enable_pcre}")
 message("")
 message("	Maintainer mode:	${enable_maintainer_mode}")
 message("	Supernovae mode:	${enable_supernovae}")