From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 25 May 2010 12:13:23 +0000 (+0000)
Subject: Test if valgrind is found for enable memcheck.
X-Git-Tag: v3_5~1016
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/147f9c133bf73b71c782aab6480c4b8785cdb729

Test if valgrind is found for enable memcheck.

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

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 792c96a63a..70c5336b8e 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -4,6 +4,22 @@ if(enable_smpi)
 	exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpicc" OUTPUT_VARIABLE "OKITOKI")
 	exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpirun" OUTPUT_VARIABLE "OKITOKI")
 endif(enable_smpi)
+
+if(enable_memcheck)
+	exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
+	if(VALGRIND_VERSION)
+		string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
+		if(NEW_VALGRIND_VERSION)
+		else(NEW_VALGRIND_VERSION)
+			set(enable_memcheck false)
+			message("Command valgrind not found --> enable_memcheck autoset to false.")
+		endif(NEW_VALGRIND_VERSION)
+	else(VALGRIND_VERSION)
+		set(enable_memcheck false)
+		message("Command valgrind not found --> enable_memcheck autoset to false.")
+	endif(VALGRIND_VERSION)
+endif(enable_memcheck)
+
 ### For code coverage
 ### Set some variables
 SET(UPDATE_TYPE "svn")
diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 761c863121..f875b231b5 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -92,6 +92,10 @@ if(enable_print_message)
 	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}")
+	endif(enable_memcheck)
 	message("________________________________________________________________________________")
 	message("________________________________________________________________________________ DEBUG END")
 	message("")