diff options
| author | Ryan Volz <ryan.volz@gmail.com> | 2020-09-08 13:22:41 -0400 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-10-05 10:36:25 +0200 |
| commit | c86f5684a6cdd5623ecb842bed060edc69abb82a (patch) | |
| tree | 41971f7f7d7b1a8de9a8764eeb82798fd761b6da /cmake | |
| parent | 555c20317fe73e7956edb00fe1070db5e1374123 (diff) | |
cmake: pybind: Use "${PYTHON_EXECUTABLE}" instead of "python3".
This fixes all of these commands on Windows and wherever "python3" is
not available. The CMake-found PYTHON_EXECUTABLE will always work or
error out earlier if python is not found.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrPybind.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cmake/Modules/GrPybind.cmake b/cmake/Modules/GrPybind.cmake index bf4c9b45cd..d6f5184b23 100644 --- a/cmake/Modules/GrPybind.cmake +++ b/cmake/Modules/GrPybind.cmake @@ -14,7 +14,7 @@ endif() if(ENABLE_DOXYGEN) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docstring_status - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "sub" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "sub" "--json_path" ${CMAKE_BINARY_DIR}/docs/doxygen/gnuradio_docstrings.json "--bindings_dir" ${CMAKE_CURRENT_SOURCE_DIR}/docstrings "--output_dir" ${CMAKE_CURRENT_BINARY_DIR} @@ -25,7 +25,7 @@ if(ENABLE_DOXYGEN) else(ENABLE_DOXYGEN) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docstring_status - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "copy" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "copy" "--bindings_dir" ${CMAKE_CURRENT_SOURCE_DIR}/docstrings "--output_dir" ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Copying ${name} docstring templates as pybind headers ...") @@ -52,8 +52,8 @@ configure_file(${CMAKE_SOURCE_DIR}/docs/doxygen/pydoc_macros.h ${CMAKE_CURRENT_B list(APPEND regen_targets "") foreach(file ${files}) - - execute_process(COMMAND "python3" + + execute_process(COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_SOURCE_DIR}/gr-utils/bindtool/scripts/header_utils.py "all" ${CMAKE_CURRENT_SOURCE_DIR}/${file} @@ -93,7 +93,7 @@ foreach(file ${files}) # Automatically regenerate the bindings add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}}/${file} - COMMAND "python3" + COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_SOURCE_DIR}/gr-utils/bindtool/scripts/bind_intree_file.py "--output_dir" ${CMAKE_CURRENT_SOURCE_DIR}/.. "--prefix" ${CMAKE_INSTALL_PREFIX} @@ -125,9 +125,9 @@ endif() if(ENABLE_DOXYGEN) - add_custom_command( + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docstring_status - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "sub" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "sub" "--json_path" ${CMAKE_BINARY_DIR}/docs/doxygen/gnuradio_docstrings.json "--bindings_dir" ${CMAKE_CURRENT_SOURCE_DIR}/docstrings "--output_dir" ${CMAKE_CURRENT_BINARY_DIR} @@ -136,9 +136,9 @@ if(ENABLE_DOXYGEN) DEPENDS gnuradio_docstrings) add_custom_target(${name}_docstrings ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/docstring_status) else(ENABLE_DOXYGEN) - add_custom_command( + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docstring_status - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "copy" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "copy" "--bindings_dir" ${CMAKE_CURRENT_SOURCE_DIR}/docstrings "--output_dir" ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Copying ${name} docstring templates as pybind headers ...") @@ -168,7 +168,7 @@ macro(GR_PYBIND_MAKE_OOT name updir filter files) list(APPEND regen_targets "") foreach(file ${files}) - execute_process(COMMAND "python3" + execute_process(COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_CURRENT_SOURCE_DIR}/header_utils.py "all" ${CMAKE_CURRENT_SOURCE_DIR}/${file} @@ -204,7 +204,7 @@ foreach(file ${files}) # Automatically regenerate the bindings add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}}/${file} - COMMAND "python3" + COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_CURRENT_SOURCE_DIR}/bind_oot_file.py "--output_dir" ${CMAKE_CURRENT_SOURCE_DIR}/.. "--prefix" ${CMAKE_INSTALL_PREFIX} @@ -238,7 +238,7 @@ if(ENABLE_DOXYGEN) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/extracted_docstrings.json - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "scrape" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "scrape" "--xml_path" ${CMAKE_BINARY_DIR}/docs/doxygen/xml "--json_path" ${CMAKE_CURRENT_BINARY_DIR}/extracted_docstrings.json COMMENT "Scraping generated documentation for docstrings ..." @@ -251,7 +251,7 @@ if(ENABLE_DOXYGEN) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docstring_status - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "sub" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "sub" "--json_path" ${CMAKE_CURRENT_BINARY_DIR}/extracted_docstrings.json "--bindings_dir" ${CMAKE_CURRENT_SOURCE_DIR}/docstrings "--output_dir" ${CMAKE_CURRENT_BINARY_DIR} @@ -262,7 +262,7 @@ if(ENABLE_DOXYGEN) else(ENABLE_DOXYGEN) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docstring_status - COMMAND python3 ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "copy" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/doxygen/update_pydoc.py "copy" "--bindings_dir" ${CMAKE_CURRENT_SOURCE_DIR}/docstrings "--output_dir" ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Copying ${name} docstring templates as pybind headers ...") |