Make it possible to compile the doc without javadoc (Fix #10)

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 1cbc2b9..92a4c9b 100644 (file)
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -7,9 +7,13 @@ else()
   find_package(Doxygen)
 endif()
 
-find_path(JAVADOC_PATH  NAMES javadoc   PATHS NO_DEFAULT_PATHS)
+if (HAVE_Java)
+  find_path(JAVADOC_PATH  NAMES javadoc   PATHS NO_DEFAULT_PATHS)
+  mark_as_advanced(JAVADOC_PATH)
+endif()
+
 find_path(FIG2DEV_PATH  NAMES fig2dev  PATHS NO_DEFAULT_PATHS)
-mark_as_advanced(JAVADOC_PATH)
+
 
 if(DOXYGEN_FOUND)
 
@@ -69,12 +73,17 @@ if(DOXYGEN_FOUND)
     COMMAND ${CMAKE_COMMAND} -E echo "XX Run doxygen again"
     COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
     COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/simgrid_modules.map
-    COMMAND ${CMAKE_COMMAND} -E echo "XX Javadoc pass"
-    COMMAND ${JAVADOC_PATH}/javadoc -quiet -d ${CMAKE_HOME_DIRECTORY}/doc/html/javadoc/ ${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/*.java ${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/*/*.java
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
     )
-
-
+    
+   if (HAVE_Java)
+      ADD_CUSTOM_COMMAND(TARGET doc
+        COMMAND ${CMAKE_COMMAND} -E echo "XX Javadoc pass"
+        COMMAND ${JAVADOC_PATH}/javadoc -quiet -d ${CMAKE_HOME_DIRECTORY}/doc/html/javadoc/ ${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/*.java ${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/*/*.java
+        WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
+      )
+   endif()
+       
 
 
 

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 87df30f..ceb82c6 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -88,15 +88,16 @@ 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}")
@@ -106,7 +107,7 @@ message("")
 if (HAVE_GTNETS)
   message("        Compile Gtnets ..............: yes (path: ${gtnets_path})")
 else()
-  message("        Compile Gtnets ..............: NO (path: ${gtnets_path})")
+  message("        Compile Gtnets ..............: NO  (path: ${gtnets_path})")
 endif()
 if (HAVE_NS3)
   message("        Compile NS-3 ................: yes (path: ${NS3_PATH})")
@@ -114,7 +115,12 @@ 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}")
@@ -123,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}")