Correct macro declaration for VA_COPY so that it does not fool cpp and works on windo...

[simgrid.git] / buildtools / Cmake / PrintArgs.cmake

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index d907191..ce004f9 100644 (file)
--- 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("")
@@ -142,7 +155,7 @@ message("")
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 message("")
 
-exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/")
-file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build  "svn version : ${SVN_VERSION}")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release   :     simgrid-${release_version}~rev${SVN_VERSION}")
+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")