apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-21 14:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2688 from schedutron/py3doc-cmake

Browse Source 
Have CMake build docs with Python3
This commit is contained in:
A.J. Beamon 2020-02-24 11:53:41 -08:00 committed by GitHub
commit 083e3f38f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FDBComponents.cmake
View File

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

20
cmake/FindVirtualenv.cmake
View File

@ -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})

4
documentation/CMakeLists.txt
View File

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