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

Jump to bottom

v3: Move detection of MPI out of FindBaselibs #390

Merged
merged 1 commit into from
Jul 15, 2024
Merged

v3: Move detection of MPI out of FindBaselibs #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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

## [3.48.0] - 2024-07-15

### Changed

- Move detection out of `FindBaselibs.cmake` for Spack purposes

## [3.47.0] - 2024-07-11

### Fixed
Expand Down
3 changes: 2 additions & 1 deletion esma.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

### MPI Support ###

# MPI is now found in FindBaselibs
set(MPI_DETERMINE_LIBRARY_VERSION TRUE)
find_package(MPI)

### Threading ###

Expand Down
8 changes: 0 additions & 8 deletions external_libraries/FindBaselibs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ endif ()

if (Baselibs_FOUND)

# For now require MPI with Baselibs
set(MPI_DETERMINE_LIBRARY_VERSION TRUE)
find_package(MPI)

link_directories (${BASEDIR}/lib)

# Add path to GFE packages
Expand Down Expand Up @@ -284,10 +280,6 @@ else ()
# These should be in each fixture

###########################################
# # For now require MPI with Baselibs #
# set(MPI_DETERMINE_LIBRARY_VERSION TRUE) #
# find_package(MPI) #
# #
# find_package(NetCDF REQUIRED Fortran) #
# add_definitions(-DHAS_NETCDF4) #
# add_definitions(-DHAS_NETCDF3) #
Expand Down
Loading