Skip to content
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

fixed profiler dependency on new gftl-v2 #1335

Merged
merged 6 commits into from
Feb 7, 2022
Merged

fixed profiler dependency on new gftl-v2 #1335

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92ec2fc
fixed profiler dependency on new gftl-v2
weiyuan-jiang Feb 4, 2022
4e63c89
Update changelog and cmakelists for 2.17.1 release
mathomp4 Feb 4, 2022
6442364
add explicit dependence of gFTL when it is used
weiyuan-jiang Feb 7, 2022
4e29ebf
Update CHANGELOG.md
mathomp4 Feb 7, 2022
057199a
Update CHANGELOG.md
mathomp4 Feb 7, 2022
cb685ae
Update generic/CMakeLists.txt
tclune Feb 7, 2022
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.17.1] - 2022-02-04

### Fixed

- Add explicit dependence of gFTL-v1 and -v2 whenever both are used (currently profiler and generic)

## [2.17.0] - 2022-01-26

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

project (
MAPL
VERSION 2.17.0
VERSION 2.17.1
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the default build type to release
Expand Down
2 changes: 1 addition & 1 deletion generic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ find_package(GFTL_SHARED REQUIRED)
esma_add_library(${this}
SRCS ${srcs}
DEPENDENCIES MAPL.oomph MAPL.shared MAPL.profiler MAPL.base
PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 GFTL_SHARED::gftl-shared-v1 GFTL::gftl
PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 GFTL_SHARED::gftl-shared-v1 GFTL::gftl GFTL::gftl-v2 GFTL::gftl-v1
TYPE ${MAPL_LIBRARY_TYPE}
)
target_include_directories (${this} PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion profiler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ set (srcs
MAPL_Profiler.F90
)

esma_add_library (${this} SRCS ${srcs} DEPENDENCIES GFTL_SHARED::gftl-shared GFTL::gftl MAPL.shared MPI::MPI_Fortran TYPE ${MAPL_LIBRARY_TYPE})
esma_add_library (${this} SRCS ${srcs} DEPENDENCIES GFTL_SHARED::gftl-shared GFTL::gftl-v1 GFTL::gftl-v2 MAPL.shared MPI::MPI_Fortran TYPE ${MAPL_LIBRARY_TYPE})
target_include_directories (${this} PRIVATE ${MAPL_SOURCE_DIR}/include)

add_subdirectory (demo EXCLUDE_FROM_ALL)
Expand Down