Again for windows.

[simgrid.git] / buildtools / Cmake / src / CMakePrintArgs.txt

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 0d3f76d..3e027f8 100644 (file)
--- 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,12 +70,16 @@ if(enable_print_message)
        message("HAVE_VSNPRINTF                 ${HAVE_VSNPRINTF}")
        message("HAVE_ASPRINTF                  ${HAVE_ASPRINTF}")
        message("HAVE_VASPRINTF                 ${HAVE_VASPRINTF}")
+       message("HAVE_MMAP                      ${HAVE_MMAP}")
 
        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}")
+       message("")
+       
        message("JNI.H :                        ${JAVA_INCLUDE_PATH}")
        message("JNI_MD.H :                     ${JAVA_INCLUDE_PATH2}")
        message("JAVAC :                        ${JAVA_COMPILE}")