[cmake] kill GenerateDocWin

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae908c1..2e257a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,11 +279,20 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)
 
-### Build the doc
+### Build the doc (Windows downloads the doc instead of regenerating)
+#
 if(NOT WIN32)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDoc.cmake)
 else()
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDocWin.cmake)
+  find_program(WGET_PROGRAM  NAMES wget)
+  message(STATUS "wget: ${WGET_PROGRAM}")
+  if(WGET_PROGRAM)
+    ADD_CUSTOM_TARGET(simgrid_documentation
+      COMMENT "Downloading the SimGrid documentation..."
+      COMMAND ${WGET_PROGRAM} -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/
+      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html
+    )
+  endif()
 endif()
 
 ### Print ARGS

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d729017..83a1a59 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1185,7 +1185,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Distrib.cmake
   tools/cmake/Flags.cmake
   tools/cmake/GenerateDoc.cmake
-  tools/cmake/GenerateDocWin.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/MakeExe.cmake
   tools/cmake/MakeJava.cmake

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 30f44e9..77d2dd7 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -363,4 +363,18 @@ add_custom_target(maintainer-clean
   WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
   )
 
+if(WIN32)
+  find_program(NSIS_PROGRAM NAMES makensi)
+  message(STATUS "nsis: ${NSIS_PROGRAM}")
+
+  if(NSIS_PROGRAM)
+    ADD_CUSTOM_TARGET(nsis
+      COMMENT "Generating the SimGrid installer for Windows..."
+      DEPENDS simgrid simgrid graphicator simgrid-colorizer simgrid_update_xml
+      COMMAND ${NSIS_PROGRAM} simgrid.nsi
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
+    )
+  endif()
+endif()
+
 include(CPack)

diff --git a/tools/cmake/GenerateDoc.cmake b/tools/cmake/GenerateDoc.cmake
index 9a5c99f..5c43242 100644 (file)
--- a/tools/cmake/GenerateDoc.cmake
+++ b/tools/cmake/GenerateDoc.cmake
@@ -1,4 +1,14 @@
-#### Generate the whole html documentation
+###
+### Generate all parts of the documentation on non-Windows systems
+###
+###   - HTML with doxygen (reference and manual)
+###   - Javadoc (reference)
+###   - manpages (reference of tools)
+###
+###  This file is not loaded on windows
+
+
+#### Generate the html documentation
 
 if (enable_documentation)
   find_package(Doxygen REQUIRED)
@@ -124,25 +134,22 @@ if (HAVE_Java)
 endif()
        
 #### Generate the manpages
-if(NOT WIN32)
-  if( NOT MANPAGE_DIR)
-    set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages )
-  endif()
-
-  add_custom_target(manpages ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
-    COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
-    COMMENT "Generating manpages"
-    )
-  install(FILES
-    ${MANPAGE_DIR}/simgrid_update_xml.1
-    ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicc.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicxx.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpif90.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpiff.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpirun.1
-    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1)
-
+if( NOT MANPAGE_DIR)
+  set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages )
 endif()
 
+add_custom_target(manpages ALL
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
+  COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
+  COMMENT "Generating manpages"
+  )
+install(FILES
+  ${MANPAGE_DIR}/simgrid_update_xml.1
+  ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1
+  ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicc.1
+  ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicxx.1
+  ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpif90.1
+  ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpiff.1
+  ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpirun.1
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1)
+

diff --git a/tools/cmake/GenerateDocWin.cmake b/tools/cmake/GenerateDocWin.cmake
deleted file mode 100644 (file)
index bfac74b..0000000
--- a/tools/cmake/GenerateDocWin.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#### Generate the html documentation
-find_program(WGET_PROGRAM  NAMES wget)
-find_program(NSIS_PROGRAM NAMES makensi)
-
-message(STATUS "wget: ${WGET_PROGRAM}")
-message(STATUS "nsis: ${NSIS_PROGRAM}")
-
-if(WGET_PROGRAM)
-  ADD_CUSTOM_TARGET(simgrid_documentation
-    COMMENT "Downloading the SimGrid documentation..."
-    COMMAND ${WGET_PROGRAM} -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/
-    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html
-    )
-endif()
-
-if(NSIS_PROGRAM)
-  ADD_CUSTOM_TARGET(nsis
-    COMMENT "Generating the SimGrid installer for Windows..."
-    DEPENDS simgrid simgrid graphicator simgrid-colorizer simgrid_update_xml
-    COMMAND ${NSIS_PROGRAM} simgrid.nsi
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
-    )
-endif()