X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=docs%2Fold-html%2FCMakeLists.txt;h=1b9b12e41a4d9428d2431c1ae599f93801b897f7;hb=89cfb2612760b1abf9cad7f94aa813d0a77d9c2b;hp=c407467e7c387a26663139a54af2b1122052edbf;hpb=e60fe9d2897fa123496a714c65f4ee4c6a860053;p=alexxy%2Fgromacs.git

diff --git a/docs/old-html/CMakeLists.txt b/docs/old-html/CMakeLists.txt
index c407467e7c..1b9b12e41a 100644
--- a/docs/old-html/CMakeLists.txt
+++ b/docs/old-html/CMakeLists.txt
@@ -36,42 +36,41 @@ include(gmxCustomCommandUtilities)
 
 set(OUTPUT_DIR final)
 
-file(GLOB_RECURSE deps
-     ${CMAKE_CURRENT_SOURCE_DIR}/images/*
-     ${CMAKE_CURRENT_SOURCE_DIR}/*.html
-     ${CMAKE_CURRENT_SOURCE_DIR}/*.css
-     )
-list(APPEND deps
-     ${CMAKE_CURRENT_SOURCE_DIR}/BuildHtmlHelp.cmake
-     ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
-     ${CMAKE_CURRENT_SOURCE_DIR}/links.dat
-     )
-
-gmx_add_custom_output_target(html OUTPUT STAMP
-    COMMAND ${CMAKE_COMMAND}
-        -D SOURCE_HTML_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-        -D OUTPUT_DIR=${OUTPUT_DIR}
-        -D STEP=PRE
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/BuildHtmlHelp.cmake
-    COMMAND gmx -quiet help -export html
-    COMMAND ${CMAKE_COMMAND}
-        -D SOURCE_HTML_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-        -D OUTPUT_DIR=${OUTPUT_DIR}
-        -D STEP=POST
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/BuildHtmlHelp.cmake
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS gmx ${deps}
-    COMMENT "Generating HTML help")
-
 set(HTML_PAGE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${OUTPUT_DIR})
 if (GMX_BUILD_HELP)
-    set_target_properties(html PROPERTIES EXCLUDE_FROM_ALL OFF)
+    # Unlike the man and completion targets, this target is not built
+    # automatically with GMX_BUILD_HELP=AUTO, since most people will not
+    # notice it missing.
+    file(GLOB_RECURSE deps
+         ${CMAKE_CURRENT_SOURCE_DIR}/images/*
+         ${CMAKE_CURRENT_SOURCE_DIR}/*.html
+         ${CMAKE_CURRENT_SOURCE_DIR}/*.css
+         )
+    list(APPEND deps
+         ${CMAKE_CURRENT_SOURCE_DIR}/BuildHtmlHelp.cmake
+         ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
+         ${CMAKE_CURRENT_SOURCE_DIR}/links.dat
+         )
+
+    gmx_add_custom_output_target(html OUTPUT STAMP
+        COMMAND ${CMAKE_COMMAND}
+            -D GMX_EXECUTABLE=$<TARGET_FILE:gmx>
+            -D SOURCE_HTML_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+            -D OUTPUT_DIR=${OUTPUT_DIR}
+            -P ${CMAKE_CURRENT_SOURCE_DIR}/BuildHtmlHelp.cmake
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        DEPENDS gmx ${deps}
+        COMMENT "Generating HTML help")
+
+    if (GMX_BUILD_HELP_FORCE)
+        set_target_properties(html PROPERTIES EXCLUDE_FROM_ALL OFF)
+    endif()
     set_directory_properties(PROPERTIES
         ADDITIONAL_MAKE_CLEAN_FILES "${OUTPUT_DIR};header.html")
     set(HTML_PAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_DIR})
 endif()
 
-if (SOURCE_IS_SOURCE_DISTRIBUTION OR GMX_BUILD_HELP)
+if (SOURCE_IS_SOURCE_DISTRIBUTION OR GMX_BUILD_HELP_FORCE)
     install(DIRECTORY ${HTML_PAGE_DIR}/
         DESTINATION ${DATA_INSTALL_DIR}/html
         COMPONENT html)