From cdc802777cbe10be06b094e92bae85d60e005cc7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 2 Aug 2024 10:34:06 -0400 Subject: [PATCH 1/2] Add FindJeMalloc.cmake (v3 branch) --- CHANGELOG.md | 2 ++ external_libraries/FindJeMalloc.cmake | 29 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 external_libraries/FindJeMalloc.cmake diff --git a/CHANGELOG.md b/CHANGELOG.md index 84d561a2..3abe3e5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Add `FindJeMalloc.cmake` for use with builds of GEOSgcm + ### Changed ### Deprecated diff --git a/external_libraries/FindJeMalloc.cmake b/external_libraries/FindJeMalloc.cmake new file mode 100644 index 00000000..2e50a822 --- /dev/null +++ b/external_libraries/FindJeMalloc.cmake @@ -0,0 +1,29 @@ +# - Find JeMalloc library +# Find the native JeMalloc includes and library +# +# JeMalloc_INCLUDE_DIRS - where to find jemalloc.h, etc. +# JeMalloc_LIBRARIES - List of libraries when using jemalloc. +# JeMalloc_FOUND - True if jemalloc found. + +find_path(JeMalloc_INCLUDE_DIRS + NAMES jemalloc/jemalloc.h + HINTS ${JEMALLOC_ROOT_DIR}/include ENV JEMALLOC_INCLUDE_DIR) + +find_library(JeMalloc_LIBRARIES + NAMES jemalloc + HINTS ${JEMALLOC_ROOT_DIR}/lib ENV JEMALLOC_LIB_DIR) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(JeMalloc DEFAULT_MSG JeMalloc_LIBRARIES JeMalloc_INCLUDE_DIRS) + +mark_as_advanced( + JeMalloc_LIBRARIES + JeMalloc_INCLUDE_DIRS) + +if(JeMalloc_FOUND AND NOT (TARGET JeMalloc::JeMalloc)) + add_library (JeMalloc::JeMalloc UNKNOWN IMPORTED) + set_target_properties(JeMalloc::JeMalloc + PROPERTIES + IMPORTED_LOCATION ${JeMalloc_LIBRARIES} + INTERFACE_INCLUDE_DIRECTORIES ${JeMalloc_INCLUDE_DIRS}) +endif() From 5235b982dbf72333b42c5a8fa945ae28dd39184e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 2 Aug 2024 10:34:58 -0400 Subject: [PATCH 2/2] Update changelog for release --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3abe3e5b..145f5684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,19 +13,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Add `FindJeMalloc.cmake` for use with builds of GEOSgcm - ### Changed ### Deprecated +## [3.50.0] - 2024-08-02 + +### Added + +- Add `FindJeMalloc.cmake` for use with builds of GEOSgcm + ## [3.49.0] - 2024-08-01 ### Changed - Edit the file `esma_add_fortran_submodules.cmake` to add the `SMOD` word to the target submodule file name. - ## [3.48.0] - 2024-07-15 ### Changed