Skip to content

P
pybind11_abseil
Commit 52f27398 by Ralf W. Grosse-Kunstleve Committed by Copybara-Service
Options

Replace `PYTHON_EXECUTABLE` with `Python_EXECUTABLE`. 

Following the suggestion here: https://github.com/pybind/pybind11/pull/4786#issuecomment-1885448824

Piggy-backed: Minor pre-commit auto-fix for top_level_CMakeLists.txt
PiperOrigin-RevId: 597371220
parent ecbbf718
Showing with 13 additions and 10 deletions
CMakeLists.txt
...@@ -29,7 +29,6 @@ FetchContent_Declare( ...@@ -29,7 +29,6 @@ FetchContent_Declare(
FetchContent_MakeAvailable(abseil-cpp pybind11) FetchContent_MakeAvailable(abseil-cpp pybind11)
set(TOP_LEVEL_DIR ${CMAKE_CURRENT_LIST_DIR}) set(TOP_LEVEL_DIR ${CMAKE_CURRENT_LIST_DIR})
include_directories(${TOP_LEVEL_DIR} include_directories(${TOP_LEVEL_DIR} ${pybind11_INCLUDE_DIRS})
${pybind11_INCLUDE_DIRS})
add_subdirectory(pybind11_abseil) add_subdirectory(pybind11_abseil)
pybind11_abseil/tests/CMakeLists.txt
...@@ -8,15 +8,19 @@ target_link_libraries( ...@@ -8,15 +8,19 @@ target_link_libraries(
shared_ptr_from_capsule absl::statusor) shared_ptr_from_capsule absl::statusor)
# cpp_capsule_tools_testing_test =============================================== # cpp_capsule_tools_testing_test ===============================================
if(NOT DEFINED PYTHON_EXECUTABLE) if(NOT DEFINED Python_EXECUTABLE)
set(PYTHON_EXECUTABLE ${PYBIND11_PYTHON_EXECUTABLE_LAST}) if(NOT DEFINED PYBIND11_PYTHON_EXECUTABLE_LAST)
set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
set(Python_EXECUTABLE ${PYBIND11_PYTHON_EXECUTABLE_LAST})
endif()
endif() endif()
add_test( add_test(
NAME cpp_capsule_tools_testing_test NAME cpp_capsule_tools_testing_test
COMMAND COMMAND
${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR} ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE} ${Python_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/cpp_capsule_tools_testing_test.py ${CMAKE_CURRENT_SOURCE_DIR}/cpp_capsule_tools_testing_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
...@@ -39,7 +43,7 @@ target_link_libraries( ...@@ -39,7 +43,7 @@ target_link_libraries(
add_test( add_test(
NAME absl_test NAME absl_test
COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/absl_test.py ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/absl_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
# ok_status_singleton_test ===================================================== # ok_status_singleton_test =====================================================
...@@ -48,7 +52,7 @@ add_test( ...@@ -48,7 +52,7 @@ add_test(
NAME ok_status_singleton_test NAME ok_status_singleton_test
COMMAND COMMAND
${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR} ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ok_status_singleton_test.py ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ok_status_singleton_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
# missing_import =============================================================== # missing_import ===============================================================
...@@ -66,7 +70,7 @@ add_test( ...@@ -66,7 +70,7 @@ add_test(
NAME missing_import_test NAME missing_import_test
COMMAND COMMAND
${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR} ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/missing_import_test.py ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/missing_import_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
# status_test ================================================================== # status_test ==================================================================
...@@ -74,7 +78,7 @@ add_test( ...@@ -74,7 +78,7 @@ add_test(
add_test( add_test(
NAME status_test NAME status_test
COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/status_test.py ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/status_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
# status_example =============================================================== # status_example ===============================================================
...@@ -89,5 +93,5 @@ add_test( ...@@ -89,5 +93,5 @@ add_test(
NAME status_example_test NAME status_example_test
COMMAND COMMAND
${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR} ${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/status_example_test.py ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/status_example_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment