Merge branch release-5-1

[alexxy/gromacs.git] / docs / CMakeLists.txt

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 134255599c0a31af82e1756f8c500b1e1403e205..7ad94c44b518f27d6c1dc594955cc3453ff2c00e 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -58,7 +58,7 @@ mark_as_advanced(SOURCE_MD5SUM)
 
 set(EXPECTED_DOXYGEN_VERSION 1.8.5)
 
-find_package(PythonInterp)
+find_package(PythonInterp 2.7)
 find_package(Sphinx 1.2.3 QUIET COMPONENTS pygments)
 
 # Even if we aren't going to make the full webpage, set up to put all
@@ -86,14 +86,14 @@ if (SPHINX_FOUND)
     set(SPHINX_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/conf.py)
     set(SPHINX_CONFIG_VARS_FILE ${SPHINX_INPUT_DIR}/conf-vars.py)
     set(SPHINX_EXTENSION_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-    if (SOURCE_IS_SOURCE_DISTRIBUTION OR GMX_BUILD_TARBALL)
-        # The real build of the webpage happens from the tarball, and
-        # this should be set to the matching MD5 sum.
-        set(REGRESSIONTEST_MD5SUM_STRING "${REGRESSIONTEST_MD5SUM}")
-    else()
+    if (SOURCE_MD5SUM STREQUAL "unknown")
         # But for testing the webpage build (e.g. from the repo) we
         # need a default value.
         set(REGRESSIONTEST_MD5SUM_STRING "unknown")
+    else()
+        # The real build of the webpage happens from the tarball, and
+        # this should be set to the matching MD5 sum.
+        set(REGRESSIONTEST_MD5SUM_STRING "${REGRESSIONTEST_MD5SUM}")
     endif()
     set(SPHINX_SOURCE_FILES
         index.rst
@@ -105,6 +105,7 @@ if (SPHINX_FOUND)
         dev-manual/gmxtree.rst
         dev-manual/includestyle.rst
         dev-manual/jenkins.rst
+        dev-manual/language-features.rst
         dev-manual/naming.rst
         dev-manual/overview.rst
         dev-manual/relocatable-binaries.rst