X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e25a4327e9e25726495b1b281bfd707ff4a392d3..f86e6af017daa4b31f72b5644b52e8962eee4b35:/buildtools/Cmake/PrintArgs.cmake

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 1b6aa93e1d..ce004f98d8 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -1,8 +1,21 @@
-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}")
+string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}")
+string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}")
+if(VBC)
+	exec_program("${CMAKE_C_COMPILER}" OUTPUT_VARIABLE "COMPILER_C_V")
+	string(REPLACE "\n" ";" COMPILER_C_V "${COMPILER_C_V}")
+	foreach(line ${COMPILER_C_V})
+		if(NOT COMPILER_C_VERSION)
+			set(COMPILER_C_VERSION "${line}")
+			set(COMPILER_CXX_VERSION "${line}")
+		endif(NOT COMPILER_C_VERSION)
+	endforeach(line ${COMPILER_C_V})
+endif(VBC)
+if(GCC)
+	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}")
+endif(GCC)
 
 if(enable_print_message)
 	message("")
@@ -99,6 +112,10 @@ if(enable_print_message)
 	message("OPTIONS  :			${MEMORYCHECK_COMMAND_OPTIONS}")
 	message("PERL	  :			${PERL_EXECUTABLE}")
 	endif(enable_memcheck)
+	message("")
+	message("HAVE_MMAP : 			${HAVE_MMAP}")
+	message("HAVE_MC : 			${HAVE_MC}")
+	message("MMALLOC_WANT_OVERIDE_LEGACY :	${MMALLOC_WANT_OVERIDE_LEGACY}")
 	message("________________________________________________________________________________")
 	message("________________________________________________________________________________ DEBUG END")
 	message("")
@@ -137,3 +154,8 @@ message("	Smpi dependencies   : 	${SMPI_DEP}")
 message("")
 message("	INSTALL_PREFIX: 	${CMAKE_INSTALL_PREFIX}")
 message("")
+
+exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
+file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
+file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")
+