Skip to content

Commit c8fdb53

Browse files
authored
DOC: use FindPython instead of FindPython3 (numpy#20447)
1 parent f317461 commit c8fdb53

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

doc/source/f2py/code/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
1515
endif()
1616

1717
# Grab Python, 3.7 or newer
18-
find_package(Python3 3.7 REQUIRED
18+
find_package(Python 3.7 REQUIRED
1919
COMPONENTS Interpreter Development.Module NumPy)
2020

2121
# Grab the variables from a local Python installation
2222
# F2PY headers
2323
execute_process(
24-
COMMAND "${Python3_EXECUTABLE}"
24+
COMMAND "${Python_EXECUTABLE}"
2525
-c "import numpy.f2py; print(numpy.f2py.get_include())"
2626
OUTPUT_VARIABLE F2PY_INCLUDE_DIR
2727
OUTPUT_STRIP_TRAILING_WHITESPACE
2828
)
2929

3030
# Print out the discovered paths
3131
include(CMakePrintHelpers)
32-
cmake_print_variables(Python3_INCLUDE_DIRS)
32+
cmake_print_variables(Python_INCLUDE_DIRS)
3333
cmake_print_variables(F2PY_INCLUDE_DIR)
34-
cmake_print_variables(Python3_NumPy_INCLUDE_DIRS)
34+
cmake_print_variables(Python_NumPy_INCLUDE_DIRS)
3535

3636
# Common variables
3737
set(f2py_module_name "fibby")
@@ -45,21 +45,21 @@ add_custom_target(
4545
)
4646
add_custom_command(
4747
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${f2py_module_c}"
48-
COMMAND ${Python3_EXECUTABLE} -m "numpy.f2py"
48+
COMMAND ${Python_EXECUTABLE} -m "numpy.f2py"
4949
"${fortran_src_file}"
5050
-m "fibby"
5151
--lower # Important
5252
DEPENDS fib1.f # Fortran source
5353
)
5454

5555
# Set up target
56-
python3_add_LIBRARY(${CMAKE_PROJECT_NAME} MODULE WITH_SOABI
56+
Python_add_library(${CMAKE_PROJECT_NAME} MODULE WITH_SOABI
5757
"${CMAKE_CURRENT_BINARY_DIR}/${f2py_module_c}" # Generated
5858
"${F2PY_INCLUDE_DIR}/fortranobject.c" # From NumPy
5959
"${fortran_src_file}" # Fortran source(s)
6060
)
6161

6262
# Depend on sources
63-
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Python3::NumPy)
63+
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Python::NumPy)
6464
add_dependencies(${CMAKE_PROJECT_NAME} genpyf)
65-
target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE "${F2PY_INCLUDE_DIR}")
65+
target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE "${F2PY_INCLUDE_DIR}")

0 commit comments

Comments
 (0)