Skip to content

Commit

Permalink
Replace PYTHON_EXECUTABLE with Python_EXECUTABLE.
Browse files Browse the repository at this point in the history
Following the suggestion here: pybind/pybind11#4786 (comment)

Piggy-backed: Minor pre-commit auto-fix for top_level_CMakeLists.txt
PiperOrigin-RevId: 597371220
  • Loading branch information
rwgk authored and Copybara-Service committed Jan 10, 2024
1 parent ecbbf71 commit 52f2739
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Expand Up @@ -29,7 +29,6 @@ FetchContent_Declare(
FetchContent_MakeAvailable(abseil-cpp pybind11)

set(TOP_LEVEL_DIR ${CMAKE_CURRENT_LIST_DIR})
include_directories(${TOP_LEVEL_DIR}
${pybind11_INCLUDE_DIRS})
include_directories(${TOP_LEVEL_DIR} ${pybind11_INCLUDE_DIRS})

add_subdirectory(pybind11_abseil)
20 changes: 12 additions & 8 deletions pybind11_abseil/tests/CMakeLists.txt
Expand Up @@ -8,15 +8,19 @@ target_link_libraries(
shared_ptr_from_capsule absl::statusor)
# cpp_capsule_tools_testing_test ===============================================

if(NOT DEFINED PYTHON_EXECUTABLE)
set(PYTHON_EXECUTABLE ${PYBIND11_PYTHON_EXECUTABLE_LAST})
if(NOT DEFINED Python_EXECUTABLE)
if(NOT DEFINED PYBIND11_PYTHON_EXECUTABLE_LAST)
set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
set(Python_EXECUTABLE ${PYBIND11_PYTHON_EXECUTABLE_LAST})
endif()
endif()

add_test(
NAME cpp_capsule_tools_testing_test
COMMAND
${CMAKE_COMMAND} -E env PYTHONPATH=$PYTHONPATH:${CMAKE_BINARY_DIR}
${PYTHON_EXECUTABLE}
${Python_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/cpp_capsule_tools_testing_test.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

Expand All @@ -39,7 +43,7 @@ target_link_libraries(
add_test(
NAME absl_test
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})

# ok_status_singleton_test =====================================================
Expand All @@ -48,7 +52,7 @@ add_test(
NAME ok_status_singleton_test
COMMAND
${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})

# missing_import ===============================================================
Expand All @@ -66,15 +70,15 @@ add_test(
NAME missing_import_test
COMMAND
${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})

# status_test ==================================================================

add_test(
NAME status_test
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})

# status_example ===============================================================
Expand All @@ -89,5 +93,5 @@ add_test(
NAME status_example_test
COMMAND
${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})

0 comments on commit 52f2739

Please sign in to comment.