cmdlinerunner.cpp: use ICommandLineOptionsModule

[alexxy/gromacs.git] / CPackInit.cmake

diff --git a/CPackInit.cmake b/CPackInit.cmake
index c7e7e3cc07064e64c671600f6a804dd0482ec34e..bc25782886e629e6752b1d62e3d0b5a996ef94f8 100644 (file)
--- a/CPackInit.cmake
+++ b/CPackInit.cmake
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+# Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -48,31 +48,29 @@ if (BUILDING_SOURCE_PACKAGE)
     # directories to include to keep the probe file names at the same place.
     # And this does not detect if things have been built in the past, but are
     # outdated.
-    if (NOT EXISTS "${CMAKE_BINARY_DIR}/docs/man/man1/gmx-view.1" OR
-        NOT EXISTS "${CMAKE_BINARY_DIR}/docs/install-guide/final/INSTALL" OR
-        NOT EXISTS "${CMAKE_BINARY_DIR}/docs/old-html/final/online.html" OR
-        NOT EXISTS "${CMAKE_BINARY_DIR}/src/programs/completion/gmx-completion.bash" OR
-        NOT EXISTS "${CMAKE_BINARY_DIR}/docs/old-html/final/programs/gmx-view.html")
+    if (NOT EXISTS "${CMAKE_BINARY_DIR}/docs/man/gmx-view.1" OR
+        NOT EXISTS "${CMAKE_BINARY_DIR}/docs/install-guide/text/INSTALL" OR
+        NOT EXISTS "${CMAKE_BINARY_DIR}/src/programs/completion/gmx-completion.bash")
         message(FATAL_ERROR
             "To create a complete source package, bash completions, "
-            "man and HTML pages, and INSTALL need to be generated. "
-            "Run 'make completion man html install-guide' to build "
-            "these parts. You can also configure with "
-            "GMX_BUILD_HELP=ON to automatically build the HTML parts.")
+            "man pages, and INSTALL need to be generated. "
+            "Run 'make completion man install-guide' to build "
+            "these parts (you will need Sphinx). You can also configure with "
+            "GMX_BUILD_HELP=ON to automatically build the completions.")
     endif()
 else()
-    # TODO: If GMX_BUILD_HELP is AUTO, it may happen that the generation fails,
-    # and things are silently left out.
+    # TODO: If GMX_BUILD_HELP is AUTO, it may happen that the generation
+    # fails, and things are silently left out.
     # Also, it is currently impossible to get these files into the binary
     # package for cross-compilation.  However, binary packages are not
     # currently used much, either...
     if (NOT CPACK_GMX_BUILD_HELP)
         message(WARNING
-            "To create a complete binary package, bash completions, and "
-            "man and HTML pages need to be generated. "
+            "To create a complete binary package, bash completions and "
+            "man pages need to be generated. "
             "You need to configure with GMX_BUILD_HELP=ON to include all "
             "in the binary package.")
-        # Building the man, html, ... targets is not sufficient because than the
+        # Building the man etc. targets is not sufficient because then the
         # install is still not done.
     endif()
 endif()