Skip to content

Fix MAPL dependencies for MAPL-as-library in CMake #2320

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
Sep 15, 2023
Merged

Fix MAPL dependencies for MAPL-as-library in CMake #2320

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
0f64478
Fix MAPL dependencies for MAPL-as-library in CMake
mathomp4 Aug 30, 2023
3e36065
Add more dependencies
mathomp4 Aug 30, 2023
18fc54f
Update date for release
mathomp4 Sep 14, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.40.4] - 2023-09-14

### Fixed

- Fixed handling of MAPL dependencies for when `find_package(MAPL)` is used

## [2.40.3] - 2023-08-03

### Changed
Expand Down
3 changes: 0 additions & 3 deletions cmake/mapl-import.cmake.in
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions mapl-import.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
include(CMakeFindDependencyMacro)

find_dependency(MPI COMPONENTS Fortran REQUIRED)
find_dependency(NetCDF COMPONENTS Fortran REQUIRED)
find_dependency(OpenMP COMPONENTS Fortran REQUIRED)

set(GFTL_FOUND @GFTL_FOUND@)
if(GFTL_FOUND)
find_dependency(GFTL HINTS @GFTL_DIR@)
endif()

set(GFTL_SHARED_FOUND @GFTL_SHARED_FOUND@)
if(GFTL_SHARED_FOUND)
find_dependency(GFTL_SHARED HINTS @GFTL_SHARED_DIR@)
endif()

set(FARGPARSE_FOUND @FARGPARSE_FOUND@)
if(FARGPARSE_FOUND)
find_dependency(FARGPARSE HINTS @FARGPARSE_DIR@)
endif()

set(PFLOGGER_FOUND @PFLOGGER_FOUND@)
if(PFLOGGER_FOUND)
find_dependency(PFLOGGER HINTS @PFLOGGER_DIR@)
endif()

list (APPEND CMAKE_MODULE_PATH @MAPL_FULL_INSTALL_DATA_DIR@/cmake)
include (mapl_create_stub_component)
include (mapl_acg)