From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 29 Jun 2010 11:28:36 +0000 (+0000)
Subject: Cosmetics.
X-Git-Tag: v3_5~867
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/31deaa1f1d3611d22f25f646044051d76b55679f?ds=sidebyside

Cosmetics.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index d585f96d8b..eb46988be7 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -76,11 +76,11 @@ endif(enable_model-checking AND HAVE_MMAP)
 
 if(enable_lua)
 	exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
-	string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")
-	string(REGEX MATCH "^[0-9]" LUA_MAJOR_VERSION "${LUA_VERSION}")
-	string(REPLACE "${LUA_MAJOR_VERSION}." "" LUA_VERSION "${LUA_VERSION}")
-	string(REGEX MATCH "^[0-9]" LUA_MINOR_VERSION "${LUA_VERSION}")
-	string(REPLACE "${LUA_MINOR_VERSION}." "" LUA_PATCH_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" LUA_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "^[0-9]+" LUA_MAJOR_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+$" LUA_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "^[0-9]+" LUA_MINOR_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "[0-9]+$" LUA_PATCH_VERSION "${LUA_VERSION}")
 
 	if(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
 	
diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index 8838e46c7a..7106d99952 100644
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -6,10 +6,20 @@ find_program(PERL_EXE NAMES perl)
 
 IF(FLEX_EXE)
 	set(HAVE_FLEX 1)
+	exec_program("${FLEX_EXE} --version" OUTPUT_VARIABLE FLEX_VERSION)
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" FLEX_VERSION "${FLEX_VERSION}")
+	string(REGEX MATCH "^[0-9]+" FLEX_MAJOR_VERSION "${FLEX_VERSION}")
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+$" FLEX_VERSION "${FLEX_VERSION}")
+	string(REGEX MATCH "^[0-9]+" FLEX_MINOR_VERSION "${FLEX_VERSION}")
+	string(REGEX MATCH "[0-9]+$" FLEX_PATCH_VERSION "${FLEX_VERSION}")
 ENDIF(FLEX_EXE)
 
 IF(FLEXML_EXE)
 	set(HAVE_FLEXML 1)
+	exec_program("${FLEXML_EXE} --version" OUTPUT_VARIABLE FLEXML_VERSION)
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+" FLEXML_VERSION "${FLEXML_VERSION}")
+	string(REGEX MATCH "^[0-9]*" FLEXML_MAJOR_VERSION "${FLEXML_VERSION}")
+	string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
 ENDIF(FLEXML_EXE)
 
 if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index c2fdb185c6..27429e0635 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -39,7 +39,7 @@ if(enable_print_message)
 	message("\#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
 	message("\#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
 	message("\#define __VA_COPY_USE 	${__VA_COPY_USE}")
-	message("mcsc                    ${mcsc}")
+	message("mcsc                    	${mcsc}")
 	message("")
 	message("HAVE_PTHREAD_CREATE		${pthread}")
 	message("HAVE_SEM_INIT			${HAVE_SEM_INIT_LIB}")
@@ -102,16 +102,16 @@ if(enable_print_message)
 	endif(enable_java)
 	if(enable_lua)
 	message("")
-	message("LUALIB.H: 			${HAVE_LUA5_1_LUALIB_H}")
-	message("LAUXLIB.H: 			${HAVE_LUA5_1_LAUXLIB_H}")
+	message("LUALIB.H : 			${HAVE_LUA5_1_LUALIB_H}")
+	message("LAUXLIB.H : 			${HAVE_LUA5_1_LAUXLIB_H}")
 	message("LUA_VERSION : 			${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION}")
 	endif(enable_lua)
 	if(enable_memcheck)
 	message("")
 	message("VALGRIND : 			${NEW_VALGRIND_VERSION}")
 	message("VALGRIND :			${VALGRIND_COMMAND}")
-	message("OPTIONS  :			${MEMORYCHECK_COMMAND_OPTIONS}")
-	message("PERL	  :			${PERL_EXECUTABLE}")
+	message("OPTIONS :			${MEMORYCHECK_COMMAND_OPTIONS}")
+	message("PERL :				${PERL_EXECUTABLE}")
 	endif(enable_memcheck)
 	if(enable_model-checking)
 	message("")
@@ -121,10 +121,12 @@ if(enable_print_message)
 	endif(enable_model-checking)
 	if(enable_maintainer_mode)
 	message("")
-	message("FLEX	: 			${FLEX_EXE}")
-	message("FLEXML	: 			${FLEXML_EXE}")
-	message("SED	: 			${SED_EXE}")
-	message("PERL	: 			${PERL_EXE}")
+	message("FLEX :	 			${FLEX_EXE}")
+	message("FLEX_VERSION :			${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
+	message("FLEXML : 			${FLEXML_EXE}")
+	message("FLEXML_VERSION :		${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
+	message("SED :	 			${SED_EXE}")
+	message("PERL : 				${PERL_EXE}")
 	endif(enable_maintainer_mode)
 	message("________________________________________________________________________________")
 	message("________________________________________________________________________________ DEBUG END")