From 92ec2fc9f76089b83b2ba24822b91a4c236aad38 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 4 Feb 2022 09:47:37 -0500 Subject: [PATCH 1/6] fixed profiler dependency on new gftl-v2 --- CHANGELOG.md | 2 ++ profiler/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bea3e5d25f7..9024dc1de780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Update profiler dependency on gftl-v2 + ### Added ### Changed diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 69d557e43ba4..a3e4c70cdbbb 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -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-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) From 4e63c894fbf19689da14fb848e259b94c90d885c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 4 Feb 2022 10:27:15 -0500 Subject: [PATCH 2/6] Update changelog and cmakelists for 2.17.1 release --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9024dc1de780..c235a90c94a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Update profiler dependency on gftl-v2 - ### Added ### Changed @@ -19,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 + +- Update profiler dependency on gftl-v2 + ## [2.17.0] - 2022-01-26 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index 2aee6368f904..6315c55e1e21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 From 6442364ada4ec1d88d62954f1348be1429c69f5a Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Mon, 7 Feb 2022 10:28:52 -0500 Subject: [PATCH 3/6] add explicit dependence of gFTL when it is used --- CHANGELOG.md | 2 ++ generic/CMakeLists.txt | 2 +- profiler/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c235a90c94a4..dbfcaad07ddc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Add explicit dependence of gFTL whenerver it is used + ### Changed ### Removed diff --git a/generic/CMakeLists.txt b/generic/CMakeLists.txt index b9399f767058..e9a498e5e6f7 100644 --- a/generic/CMakeLists.txt +++ b/generic/CMakeLists.txt @@ -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 diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index a3e4c70cdbbb..7d3e6dfc41b6 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -49,7 +49,7 @@ set (srcs MAPL_Profiler.F90 ) -esma_add_library (${this} SRCS ${srcs} DEPENDENCIES GFTL_SHARED::gftl-shared GFTL::gftl-v2 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) From 4e29ebfbaa609e57e4daa9448625e2b0d998d4e3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Feb 2022 10:51:31 -0500 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbfcaad07ddc..142c2a349f12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Add explicit dependence of gFTL whenerver it is used ### Changed @@ -23,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Update profiler dependency on gftl-v2 +- Add explicit dependence of gFTL-v1 and -v2 whenever both are used (currently profiler and generic) ## [2.17.0] - 2022-01-26 From 057199a35ae9b72ff3dd4036128cce8cfc24aa8d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Feb 2022 10:51:57 -0500 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 142c2a349f12..47cc3b4d1180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - ### Changed ### Removed From cb685aecee6f8a4626e9f01e5f37607d0d272ed4 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Mon, 7 Feb 2022 11:37:12 -0500 Subject: [PATCH 6/6] Update generic/CMakeLists.txt --- generic/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/CMakeLists.txt b/generic/CMakeLists.txt index e9a498e5e6f7..643fc9bcf985 100644 --- a/generic/CMakeLists.txt +++ b/generic/CMakeLists.txt @@ -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 GFTL::gftl-v2 GFTL::gftl-v1 + PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 GFTL_SHARED::gftl-shared-v1 GFTL::gftl-v2 GFTL::gftl-v1 TYPE ${MAPL_LIBRARY_TYPE} ) target_include_directories (${this} PUBLIC