Merge pull request #2688 from schedutron/py3doc-cmake

Have CMake build docs with Python3

cmake/FDBComponents.cmake

@@ -70,8 +70,8 @@ endif()
 # Pip
 ################################################################################
 
-find_package(Virtualenv)
-if (Virtualenv_FOUND)
+find_package(Python3 COMPONENTS Interpreter)
+if (Python3_Interpreter_FOUND)
   set(WITH_DOCUMENTATION ON)
 else()
   set(WITH_DOCUMENTATION OFF)

cmake/FindVirtualenv.cmake

@@ -1,20 +0,0 @@
-find_program(_VIRTUALENV_EXE virtualenv)
-
-# get version and test that program actually works
-if(_VIRTUALENV_EXE)
-  execute_process(
-    COMMAND ${_VIRTUALENV_EXE} --version
-    RESULT_VARIABLE ret_code
-    OUTPUT_VARIABLE version_string
-    ERROR_VARIABLE error_output
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(ret_code EQUAL 0 AND NOT ERROR_VARIABLE)
-    # we found a working virtualenv
-    set(VIRTUALENV_EXE ${_VIRTUALENV_EXE})
-    set(VIRTUALENV_VERSION version_string)
-  endif()
-endif()
-
-find_package_handle_standard_args(Virtualenv
-  REQUIRED_VARS VIRTUALENV_EXE
-  VERSION_VAR ${VIRTUALENV_VERSION})

documentation/CMakeLists.txt

@@ -10,7 +10,7 @@ set(pip_command ${venv_dir}/bin/pip${EXE_SUFFIX})
 set(python_command ${venv_dir}/bin/python${EXE_SUFFIX})
 
 add_custom_command(OUTPUT ${venv_dir}/venv_setup
-  COMMAND ${VIRTUALENV_EXE} venv &&
+  COMMAND ${Python3_EXECUTABLE} -m venv venv &&
           ${CMAKE_COMMAND} -E copy ${sphinx_dir}/.pip.conf ${venv_dir}/pip.conf &&
           . ${venv_dir}/bin/activate &&
           ${pip_command} install --upgrade pip &&
@@ -86,7 +86,7 @@ else()
 endif()
 
 add_custom_target(docpreview
-  COMMAND ${python_command} -m SimpleHTTPServer ${port}
+  COMMAND ${python_command} -m http.server ${port}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
   USES_TERMINAL)
 add_dependencies(docpreview html)