@@ -15,23 +15,23 @@ if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
15
15
endif ()
16
16
17
17
# Grab Python, 3.7 or newer
18
- find_package (Python3 3.7 REQUIRED
18
+ find_package (Python 3.7 REQUIRED
19
19
COMPONENTS Interpreter Development.Module NumPy )
20
20
21
21
# Grab the variables from a local Python installation
22
22
# F2PY headers
23
23
execute_process (
24
- COMMAND "${Python3_EXECUTABLE } "
24
+ COMMAND "${Python_EXECUTABLE } "
25
25
-c "import numpy.f2py; print(numpy.f2py.get_include())"
26
26
OUTPUT_VARIABLE F2PY_INCLUDE_DIR
27
27
OUTPUT_STRIP_TRAILING_WHITESPACE
28
28
)
29
29
30
30
# Print out the discovered paths
31
31
include (CMakePrintHelpers )
32
- cmake_print_variables (Python3_INCLUDE_DIRS )
32
+ cmake_print_variables (Python_INCLUDE_DIRS )
33
33
cmake_print_variables (F2PY_INCLUDE_DIR )
34
- cmake_print_variables (Python3_NumPy_INCLUDE_DIRS )
34
+ cmake_print_variables (Python_NumPy_INCLUDE_DIRS )
35
35
36
36
# Common variables
37
37
set (f2py_module_name "fibby" )
@@ -45,21 +45,21 @@ add_custom_target(
45
45
)
46
46
add_custom_command (
47
47
OUTPUT "${CMAKE_CURRENT_BINARY_DIR} /${f2py_module_c} "
48
- COMMAND ${Python3_EXECUTABLE } -m "numpy.f2py"
48
+ COMMAND ${Python_EXECUTABLE } -m "numpy.f2py"
49
49
"${fortran_src_file} "
50
50
-m "fibby"
51
51
--lower # Important
52
52
DEPENDS fib1.f # Fortran source
53
53
)
54
54
55
55
# Set up target
56
- python3_add_LIBRARY (${CMAKE_PROJECT_NAME} MODULE WITH_SOABI
56
+ Python_add_library (${CMAKE_PROJECT_NAME} MODULE WITH_SOABI
57
57
"${CMAKE_CURRENT_BINARY_DIR} /${f2py_module_c} " # Generated
58
58
"${F2PY_INCLUDE_DIR} /fortranobject.c" # From NumPy
59
59
"${fortran_src_file} " # Fortran source(s)
60
60
)
61
61
62
62
# Depend on sources
63
- target_link_libraries (${CMAKE_PROJECT_NAME} PRIVATE Python3 ::NumPy )
63
+ target_link_libraries (${CMAKE_PROJECT_NAME} PRIVATE Python ::NumPy )
64
64
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