Use label to select doxygen version
authorTeemu Murtola <teemu.murtola@gmail.com>
Sun, 23 Dec 2018 19:17:19 +0000 (20:17 +0100)
committerTeemu Murtola <teemu.murtola@gmail.com>
Mon, 24 Dec 2018 07:49:16 +0000 (08:49 +0100)
Change-Id: Ic5276e846867e1dd77250500dcb8693946258e0c

admin/builds/documentation.py

index 7ad7ecb3d3ebc3af3be658b93f9bf0c8ab75c94f..c2d7676553e9d39247ade93e4a67cba3a5f26faa 100644 (file)
@@ -35,6 +35,7 @@
 import os
 import re
 
+build_options = ['doxygen-1.8.5']
 build_out_of_source = True
 
 extra_options = {
@@ -57,9 +58,8 @@ def do_build(context):
         cmake_opts['GMX_BUILD_TARBALL'] = 'ON'
     elif context.job_type == JobType.GERRIT:
         cmake_opts['GMX_COMPACT_DOXYGEN'] = 'ON'
-    cmake_opts.update(context.get_doc_cmake_options(
-        doxygen_version='1.8.5', sphinx_version='1.6.1'))
-    context.run_cmake(cmake_opts);
+    cmake_opts['DOXYGEN_EXECUTABLE'] = context.env.doxygen_command
+    context.run_cmake(cmake_opts)
 
     # we keep the individual build targets here to ensure some
     # granularity of the resulting error messages (if any).