Skip to content

v3: Add DEPENDS for f2py #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathomp4 merged 3 commits into from
May 2, 2025
Merged

v3: Add DEPENDS for f2py #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
381fb33
v3: Add DEPENDS for f2py
mathomp4 May 2, 2025
4dccf47
Merge branch 'release/v3' into feature/v3-add-depends-cmake
mathomp4 May 2, 2025
17561c6
Update changelog
mathomp4 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

### Changed

### Deprecated

## [3.60.0] - 2025-05-02

### Changed

### Added

- Explicitly set `CMAKE_INSTALL_LIBDIR` to `lib` to override `GNUInstallDirs` from setting it to `lib64`. This is mainly needed due to assumptions in GEOS scripting

### Changed

- Added support for Emerald Rapids

### Deprecated
- Added `DEPENDS` option to f2py and f2py3 code to pass dependencies to the `add_custom_command` used to call f2py

## [3.59.0] - 2025-04-24

Expand Down
8 changes: 4 additions & 4 deletions python/f2py/UseF2Py.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ macro (add_f2py_module _name)
# Parse arguments.
set (options USE_MPI USE_OPENMP USE_NETCDF DOUBLE_PRECISION)
set (oneValueArgs DESTINATION)
set (multiValueArgs SOURCES ONLY LIBRARIES INCLUDEDIRS)
set (multiValueArgs SOURCES DEPENDS ONLY LIBRARIES INCLUDEDIRS)
cmake_parse_arguments(add_f2py_module "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )

set(only_list ${add_f2py_module_ONLY})
Expand Down Expand Up @@ -275,15 +275,15 @@ macro (add_f2py_module _name)
${F2PY_EXECUTABLE} ${F2PY_QUIET} -m ${_name}
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py-${_name}"
${_fcompiler_opts} ${_inc_opts} ${_lib_opts} -c ${_abs_srcs} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py_module_SOURCES}
DEPENDS ${add_f2py_module_SOURCES} ${add_f2py_module_DEPENDS}
COMMENT "[F2PY] Building Fortran to Python interface module ${_name}")
else ()
if ( "${add_f2py_module_SOURCES}" MATCHES "^[^;]*\\.pyf;" )
add_custom_command(OUTPUT "${_name}${F2PY_SUFFIX}"
COMMAND ${F2PY_EXECUTABLE} ${F2PY_QUIET} -m ${_name}
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py-${_name}"
${_fcompiler_opts} ${_inc_opts} -c ${_abs_srcs} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py_module_SOURCES}
DEPENDS ${add_f2py_module_SOURCES} ${add_f2py_module_DEPENDS}
COMMENT "[F2PY] Building Fortran to Python interface module ${_name}")
else ( "${add_f2py_module_SOURCES}" MATCHES "^[^;]*\\.pyf;" )
add_custom_command(OUTPUT "${_name}${F2PY_SUFFIX}"
Expand All @@ -294,7 +294,7 @@ macro (add_f2py_module _name)
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py-${_name}"
-c "${CMAKE_CURRENT_BINARY_DIR}/f2py-${_name}/${_name}.pyf"
${_fcompiler_opts} ${_inc_opts} ${_lib_opts} ${_abs_srcs} ${_lib_opts} ${_only} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py_module_SOURCES}
DEPENDS ${add_f2py_module_SOURCES} ${add_f2py_module_DEPENDS}
COMMENT "[F2PY] Building Fortran to Python interface module ${_name}")
endif ( "${add_f2py_module_SOURCES}" MATCHES "^[^;]*\\.pyf;" )
endif ()
Expand Down
8 changes: 4 additions & 4 deletions python/f2py3/UseF2Py3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ macro (add_f2py3_module _name)
# Parse arguments.
set (options USE_MPI USE_OPENMP USE_NETCDF DOUBLE_PRECISION)
set (oneValueArgs DESTINATION)
set (multiValueArgs SOURCES ONLY LIBRARIES INCLUDEDIRS)
set (multiValueArgs SOURCES DEPENDS ONLY LIBRARIES INCLUDEDIRS)
cmake_parse_arguments(add_f2py3_module "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )

set(only_list ${add_f2py3_module_ONLY})
Expand Down Expand Up @@ -275,15 +275,15 @@ macro (add_f2py3_module _name)
${F2PY3_EXECUTABLE} ${F2PY_QUIET} -m ${_name}
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py3-${_name}"
${_fcompiler_opts} ${_inc_opts} ${_lib_opts} -c ${_abs_srcs} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py3_module_SOURCES}
DEPENDS ${add_f2py3_module_SOURCES} ${add_f2py3_module_DEPENDS}
COMMENT "[F2PY3] Building Fortran to Python3 interface module ${_name}")
else ()
if ( "${add_f2py3_module_SOURCES}" MATCHES "^[^;]*\\.pyf;" )
add_custom_command(OUTPUT "${_name}${F2PY3_SUFFIX}"
COMMAND ${F2PY3_EXECUTABLE} ${F2PY_QUIET} -m ${_name}
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py3-${_name}"
${_fcompiler_opts} ${_inc_opts} -c ${_abs_srcs} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py3_module_SOURCES}
DEPENDS ${add_f2py3_module_SOURCES} ${add_f2py3_module_DEPENDS}
COMMENT "[F2PY3] Building Fortran to Python3 interface module ${_name}")
else ( "${add_f2py3_module_SOURCES}" MATCHES "^[^;]*\\.pyf;" )
add_custom_command(OUTPUT "${_name}${F2PY3_SUFFIX}"
Expand All @@ -294,7 +294,7 @@ macro (add_f2py3_module _name)
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py3-${_name}"
-c "${CMAKE_CURRENT_BINARY_DIR}/f2py3-${_name}/${_name}.pyf"
${_fcompiler_opts} ${_inc_opts} ${_lib_opts} ${_abs_srcs} ${_lib_opts} ${_only} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py3_module_SOURCES}
DEPENDS ${add_f2py3_module_SOURCES} ${add_f2py3_module_DEPENDS}
COMMENT "[F2PY3] Building Fortran to Python3 interface module ${_name}")
endif ( "${add_f2py3_module_SOURCES}" MATCHES "^[^;]*\\.pyf;" )
endif ()
Expand Down