X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9dbeb2372ad9a123d0558132ebb6e003e10aa641..f26cd6685142f04fd0024837cd5251ceb34dbc41:/buildtools/Cmake/PrintArgs.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 928da8fa14..ceb82c668a 100644
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -88,28 +88,39 @@ if(CMAKE_CXX_COMPILER)
   message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})")
   message("                version .............: ${COMPILER_CXX_VERSION}")
 endif()
-if(CMAKE_Java_COMPILER)
-  message("        Compiler: Java ..............: ${CMAKE_Java_COMPILER} (${CMAKE_Java_COMPILER_ID})")
-  message("                version .............: ${COMPILER_Java_VERSION}")
+if(HAVE_Java)
+  message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
+  message("                version .............: ${Java_VERSION_STRING}")
 endif()
 if(CMAKE_Fortran_COMPILER)
   message("        Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (${CMAKE_Fortran_COMPILER_ID})")
   message("                version .............: ${COMPILER_Fortran_VERSION}")
 endif()
 message("        Linker: .....................: ${CMAKE_LINKER}")
+message("                version .............: ${LINKER_VERSION}")
 message("")
 message("        CFlags ......................: ${CMAKE_C_FLAGS}")
 message("        CXXFlags ....................: ${CMAKE_CXX_FLAGS}")
 message("        LDFlags .....................: ${CMAKE_C_LINK_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}")
+
+if (HAVE_GTNETS)
+  message("        Compile Gtnets ..............: yes (path: ${gtnets_path})")
+else()
+  message("        Compile Gtnets ..............: NO  (path: ${gtnets_path})")
+endif()
+if (HAVE_NS3)
+  message("        Compile NS-3 ................: yes (path: ${NS3_PATH})")
+else()
+  message("        Compile NS-3 ................: NO  (hint: ${NS3_HINT})")
 endif()
 
-message("        Compile Java ................: ${HAVE_Java}")
+if (HAVE_Java)
+  message("        Compile Java ................: yes")
+  message("          Native lib in jar .........: ${enable_lib_in_jar}")
+else()
+  message("        Compile Java ................: NO")
+endif()
 message("        Compile Scala................: ${HAVE_Scala}")
 message("        Compile Lua .................: ${HAVE_LUA}")
 message("        Compile Smpi ................: ${HAVE_SMPI}")
@@ -118,9 +129,6 @@ message("        Compile Smpi f77 ............: ${SMPI_FORTRAN}")
 message("        Compile Smpi f90 ............: ${SMPI_FORTRAN}")
 message("        Compile Boost.Context support: ${HAVE_BOOST_CONTEXT}")
 message("        Compile Static ..............: ${enable_lib_static}")
-if(enable_java)
-  message("        Native lib in jar ...........: ${enable_lib_in_jar}")
-endif()
 message("")
 message("        Maintainer mode .............: ${enable_maintainer_mode}")
 message("        Documentation................: ${enable_documentation}")