Fix calc_grid avoiding PME grid factor 84

[alexxy/gromacs.git] / CPackInit.cmake

diff --git a/CPackInit.cmake b/CPackInit.cmake
index 779124f2a1c255226d19378e3b5f11c074a653e6..498b034306f05bcd4f03dbda8f664ffd538e7e92 100644 (file)
--- a/CPackInit.cmake
+++ b/CPackInit.cmake
@@ -33,16 +33,28 @@
 # the research papers on the package. Check out http://www.gromacs.org.
 
 #TODO: add check that source doesn't contain any untracked files
-if(CPACK_SOURCE_PACKAGE_FILE_NAME) #building source package
+if(NOT CPACK_INSTALL_CMAKE_PROJECTS) #building source package
     get_filename_component(CMAKE_BINARY_DIR ${CPACK_OUTPUT_CONFIG_FILE} PATH)
-    if (NOT EXISTS "${CMAKE_BINARY_DIR}/share/man/man1/gmx-view.1" OR
-        NOT EXISTS "${CMAKE_BINARY_DIR}/INSTALL" OR
-        NOT EXISTS "${CMAKE_BINARY_DIR}/share/html/final/online.html")
+    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")
         message(FATAL_ERROR
-            "To create a complete source package all man and HTML pages need "
-            "to be generated, and the INSTALL file generated. "
-            "Run 'make man html' to build these parts. You can also set "
-            "GMX_BUILD_HELP=ON to automatically build the HTML parts. "
-            "The latter also requires you to execute 'make install-guide'.")
+            "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.")
+    endif()
+else()
+    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. "
+            "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
+        # install is still not done.
     endif()
 endif()