X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd3ed993c66a191cea33f345f97686602e79f5db..eaf80a64fd18b2d35009508428cb58902c755433:/buildtools/Cmake/src/CMakePrintArgs.txt

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 3fdb623cc5..761c863121 100644
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -1,11 +1,14 @@
-exec_program("echo `${CMAKE_C_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_C_VERSION")
-exec_program("echo `${CMAKE_CXX_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
+exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
+exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
+
+string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}")
+string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_CXX_VERSION "${COMPILER_CXX_VERSION}")
 
 if(enable_print_message)
 	message("")
 	message("________________________________________________________________________________")
 	message("________________________________________________________________________________ DEBUG")
-	message("Project_BINARY_DIR   : ${Project_BINARY_DIR}")
+	message("simgrid_BINARY_DIR   : ${simgrid_BINARY_DIR}")
 	message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}")
 	message("")
 	message("SIZEOF_MAX :			${SIZEOF_MAX}")
@@ -67,20 +70,28 @@ if(enable_print_message)
 	message("HAVE_VSNPRINTF			${HAVE_VSNPRINTF}")
 	message("HAVE_ASPRINTF			${HAVE_ASPRINTF}")
 	message("HAVE_VASPRINTF			${HAVE_VASPRINTF}")
-
+	message("HAVE_MMAP			${HAVE_MMAP}")
+	if(enable_ruby)
 	message("")
 	message("RUBY_EXE :			${RUBY_EXECUTABLE}")
 	message("RUBY.H :			${RUBY_INCLUDE_DIR}")
 	message("CONFIG.H :			${RUBY_CONFIG_INCLUDE_DIR}")
-	message("LIB_RUBY :			${LIB_RUBY_PATH}${LIB_RUBY_VERSION}")
+	message("LIB_RUBY :			${RUBY_LIBRARY}")
+	message("LIB_RUBY_VERSION :		${LIB_RUBY_VERSION}")
+	endif(enable_ruby)
+	if(enable_java)
+	message("")
 	message("JNI.H : 			${JAVA_INCLUDE_PATH}")
 	message("JNI_MD.H : 			${JAVA_INCLUDE_PATH2}")
 	message("JAVAC : 			${JAVA_COMPILE}")
-	message("CMAKE_JAVA_COMPILER        :	${CMAKE_JAVA_COMPILER}")
-	message("CMAKE_JAVA_LINK_EXECUTABLE :	${CMAKE_JAVA_LINK_EXECUTABLE}")
+	message("JAVA_ARCHIVE : 			${JAVA_ARCHIVE}")
+	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}")
+	endif(enable_lua)
 	message("________________________________________________________________________________")
 	message("________________________________________________________________________________ DEBUG END")
 	message("")
@@ -107,9 +118,11 @@ message("	Compile Java   :   	${HAVE_JAVA}")
 message("	Compile Lua    :    	${HAVE_LUA}")
 message("	Compile Ruby   :    	${HAVE_RUBY}")
 message("")
+message("	Compile Smpi   :    	${enable_smpi}")
 message("	Maintainer mode:	${enable_maintainer_mode}")
 message("	Supernovae mode:	${enable_supernovae}")
 message("	Tracing mode   :	${enable_tracing}")
+message("	Model checking :	${enable_model-checking}")
 message("")
 message("	Simgrid dependencies: 	${SIMGRID_DEP}")
 message("	Gras dependencies   : 	${GRAS_DEP}")