revert [a30523e] (remove supernovae) because I need some timings on G5K, and fix...

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

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index be1d029..5b9912f 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -1,22 +1,3 @@
-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("")
        message("________________________________________________________________________________")
@@ -93,10 +74,10 @@ if(enable_print_message)
        message("")
 endif(enable_print_message)
 
-message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}) on arch (=${GRAS_THISARCH}):")
+message("\nConfiguration of package `simgrid' on arch (=${GRAS_THISARCH}):")
 message("           BUILDNAME :        ${BUILDNAME}")
 message("           SITE      :        ${SITE}")
-message("           Release   :        simgrid-${release_version}~rev${SVN_VERSION}")
+message("           Release   :        simgrid-${release_version}")
 message("")
 message("       Compiler: c++ :        ${CMAKE_CXX_COMPILER}")
 message("              version:        ${COMPILER_CXX_VERSION}")
@@ -108,11 +89,11 @@ message("         CPPFlags:        ${CMAKE_CXX_FLAGS}")
 message("")
 if(NOT APPLE AND NOT WIN32)
 message("      Compile Gtnets :        ${HAVE_GTNETS}")
+message("      Compile NS-3   :        ${HAVE_NS3}")
 message("      Gtnets path    :        ${gtnets_path}")
+message("      NS-3 path      :        ${ns3_path}")
 endif(NOT APPLE AND NOT WIN32)
-message("      Compile Java   :        ${HAVE_JAVA}")
 message("      Compile Lua    :        ${HAVE_LUA}")
-message("      Compile Ruby   :        ${HAVE_RUBY}")
 message("      Compile Smpi   :        ${enable_smpi}")
 message("      Compile Static :        ${enable_lib_static}")
 message("")
@@ -130,9 +111,9 @@ message("   Smpi dependencies   :   ${SMPI_DEP}")
 message("")
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 
-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")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Pipol user  : $ENV{PIPOL_USER}\n")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")
+exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
+file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
+file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")
+file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol user  : $ENV{PIPOL_USER}\n")
+file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")