[cmake] factorize the output of windows and non-windows

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb76757..1a646b6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,16 +180,6 @@ if(WIN32)
 
   set(_XBT_WIN32 1)
 
 
   set(_XBT_WIN32 1)
 

-  message(STATUS "C_COMPILER                    ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_VERSION}")
-  message(STATUS "CXX_COMPILER                  ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION}")
-  message(STATUS "CMAKE_RC_COMPILER             ${CMAKE_RC_COMPILER}")
-  message(STATUS "LIB                           ${CMAKE_LIB_WIN}")
-  message(STATUS "MAKE_PROGRAM                  ${CMAKE_MAKE_PROGRAM}")
-  message(STATUS "CMAKE_BUILD_TOOL              ${CMAKE_BUILD_TOOL}")
-  message(STATUS "LINKER                        ${CMAKE_LINKER}")
-  message(STATUS "CMAKE_GENERATOR               ${CMAKE_GENERATOR}")
-  message(STATUS "GNUC                          ${CMAKE_COMPILER_IS_GNUCC}")
-

 endif()
 
 include_directories(${INCLUDES})
 endif()
 
 include_directories(${INCLUDES})


@@ -1038,8 +1028,10 @@ message("______________________________________________________________________"
 message("______________________________________________________________________ DEBUG END")
 message("")
 
 message("______________________________________________________________________ DEBUG END")
 message("")
 

+

 message("\nConfiguration of package `simgrid':")
 message("\nConfiguration of package `simgrid':")

-message("        BUILDNAME ...................: ${BUILDNAME}")
+message("        Build Name ..................: ${BUILDNAME}")
+message("        Cmake Generator .............: ${CMAKE_GENERATOR}")

 message("        SITE ........................: ${SITE}")
 if(release)
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (release build)")
 message("        SITE ........................: ${SITE}")
 if(release)
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (release build)")


@@ -1047,12 +1039,11 @@ else()
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (development build)")
 endif()
 message("")
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (development build)")
 endif()
 message("")

-message("        Compiler: C .................: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})")
+message("        Compiler: C .................: ${CMAKE_C_COMPILER} (id: ${CMAKE_C_COMPILER_ID})")

 message("                version .............: ${CMAKE_C_COMPILER_VERSION}")
 message("                version .............: ${CMAKE_C_COMPILER_VERSION}")

-if(CMAKE_CXX_COMPILER)
-  message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})")
-  message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")
-endif()
+message("                is gnu ..............: ${CMAKE_COMPILER_IS_GNUCC}")
+message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (id: ${CMAKE_CXX_COMPILER_ID})")
+message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")

 if(${Java_FOUND})
   message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
   message("                version .............: ${Java_VERSION_STRING}")
 if(${Java_FOUND})
   message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
   message("                version .............: ${Java_VERSION_STRING}")


@@ -1063,11 +1054,12 @@ else()
 endif()
 endif()
 if(CMAKE_Fortran_COMPILER)
 endif()
 endif()
 if(CMAKE_Fortran_COMPILER)

-  message("        Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (${CMAKE_Fortran_COMPILER_ID})")
+  message("        Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (id: ${CMAKE_Fortran_COMPILER_ID})")

   message("                version .............: ${CMAKE_Fortran_COMPILER_VERSION}")
 endif()
 message("        Linker: .....................: ${CMAKE_LINKER}")
 message("                version .............: ${LINKER_VERSION}")
   message("                version .............: ${CMAKE_Fortran_COMPILER_VERSION}")
 endif()
 message("        Linker: .....................: ${CMAKE_LINKER}")
 message("                version .............: ${LINKER_VERSION}")

+message("        Make program: ...............: ${CMAKE_MAKE_PROGRAM}")

 message("")
 message("        CFlags ......................: ${CMAKE_C_FLAGS}")
 message("        CXXFlags ....................: ${CMAKE_CXX_FLAGS}")
 message("")
 message("        CFlags ......................: ${CMAKE_C_FLAGS}")
 message("        CXXFlags ....................: ${CMAKE_CXX_FLAGS}")


@@ -1087,7 +1079,6 @@ if (${Java_FOUND})
 else()
   message("        Compile Java ................: NO")
 endif()
 else()
   message("        Compile Java ................: NO")
 endif()

-message("        Compile Scala................: ${HAVE_Scala}")

 message("        Compile Lua .................: ${HAVE_LUA}")
 message("        Compile Smpi ................: ${HAVE_SMPI}")
 message("        Compile MPI testsuite .......: ${enable_smpi_MPICH3_testsuite}")
 message("        Compile Lua .................: ${HAVE_LUA}")
 message("        Compile Smpi ................: ${HAVE_SMPI}")
 message("        Compile MPI testsuite .......: ${enable_smpi_MPICH3_testsuite}")