From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 2 Aug 2010 08:57:47 +0000 (+0000)
Subject: Cosmetics.
X-Git-Tag: v3_5~737
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a358e7ed1de9ba360d9b4644546ef97dbaaac6fd?hp=f906a2a1b83328d2ef01ea2a00bea38e076e9429

Cosmetics.

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

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index a939d0724b..cc171e48c1 100644
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -2,7 +2,7 @@ if(enable_maintainer_mode AND NOT WIN32)
 find_program(FLEX_EXE NAMES flex)
 find_program(FLEXML_EXE NAMES flexml)
 find_program(SED_EXE NAMES sed)
-find_program(PERL_EXE NAMES perl)
+include(FindPerl)
 
 IF(FLEX_EXE)
 	set(HAVE_FLEX 1)
@@ -133,7 +133,7 @@ else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 	message(FATAL_ERROR "Need to install all tools for maintainer mode !!!")
 endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 
-if(PERL_EXE)
+if(PERL_EXECUTABLE)
 	
 	ADD_CUSTOM_COMMAND(
   	OUTPUT	${PROJECT_DIRECTORY}/src/cunit_unit.c
@@ -211,9 +211,9 @@ if(PERL_EXE)
 								${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c
 						)
 	
-else(PERL_EXE)
+else(PERL_EXECUTABLE)
 	message(FATAL_ERROR "Install perl before use maintainer mode")
-endif(PERL_EXE)
+endif(PERL_EXECUTABLE)
 
 endif(enable_maintainer_mode AND NOT WIN32)
 
diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 89b82fb59a..6cbe6d95ca 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -75,7 +75,7 @@ mark_as_advanced(DOXYGEN_PATH)
 mark_as_advanced(FIG2DEV_PATH)
 mark_as_advanced(FLEXML_EXE)
 mark_as_advanced(FLEX_EXE)
-mark_as_advanced(PERL_EXE)
+mark_as_advanced(PERL_EXECUTABLE)
 mark_as_advanced(GCOV_PATH)
 mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index b071f82a3e..37ea0c6114 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -70,7 +70,6 @@ if(enable_print_message)
 	message("HAVE_STDLIB_H			${HAVE_STDLIB_H}")
 	message("HAVE_STRINGS_H			${HAVE_STRINGS_H}")
 	message("HAVE_STRING_H			${HAVE_STRING_H}")
-	message("HAVE_CGRAPH_H			${HAVE_CGRAPH_H}")
 
 	message("")
 	message("HAVE_GETTIMEOFDAY 		${HAVE_GETTIMEOFDAY}")
@@ -103,9 +102,8 @@ 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("LUA_VERSION : 			${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION}")
+	message("LUA_INCLUDE_DIR : 		${LUA_INCLUDE_DIR}")
+	message("LIBLUA : 			${liblua}")
 	endif(enable_lua)
 	if(enable_memcheck)
 	message("")
@@ -127,7 +125,7 @@ if(enable_print_message)
 	message("FLEXML : 			${FLEXML_EXE}")
 	message("FLEXML_VERSION :		${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
 	message("SED :	 			${SED_EXE}")
-	message("PERL : 				${PERL_EXE}")
+	message("PERL : 				${PERL_EXECUTABLE}")
 	endif(enable_maintainer_mode)
 	message("")
 	message("libcgraph :			${HAVE_CGRAPH_LIB}")