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.

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

Pull out FindPNETCDF CMake module #2841

Merged
merged 15 commits into from
Mar 12, 2024
Merged

Pull out FindPNETCDF CMake module #2841

merged 15 commits into from
Mar 12, 2024

Conversation

ZedThree
Copy link
Contributor

This also fixes an issue where MPI was not linked when using pnetcdf with a serial HDF5

  • Pull out all the PnetCDF CMake stuff into a separate module
  • Make it a configure-time error if ENABLE_PNETCDF is true but PnetCDF not found
  • Replace include_directories with target_link_libraries for PnetCDF

I noticed that there are three CMake variables that are now always set to the same values as each other: ENABLE/USE/STATUS_PNETCDF. ENABLE is the user configure option, and USE is the internal preprocessor feature macro, so STATUS_PNETCDF could be replaced entirely by ENABLE_PNETCDF

cmake/modules/FindPNETCDF.cmake Outdated Show resolved Hide resolved
cmake/modules/FindPNETCDF.cmake Outdated Show resolved Hide resolved
cmake/modules/FindPNETCDF.cmake Outdated Show resolved Hide resolved
cmake/modules/FindPNETCDF.cmake Outdated Show resolved Hide resolved
cmake/dependencies.cmake Outdated Show resolved Hide resolved
@WardF WardF self-assigned this Jan 23, 2024
@WardF WardF added this to the 4.9.3 milestone Jan 23, 2024
* main:
  Escape a character causing a doxygen error.
  Updated release notes.
  Added a comment block for future reference.
  more syntax fixes
  Update CMakeLists.txt
  CMake: Find HDF5 header we can safely include for other checks
  moving functions and macros to new file, lowercase things
  Update release notes.
  lowercase
  lower case
  lowercase
  moving functions and macros to a file
  CMake: Add support for UNITY_BUILD
  Change signature of `nczm_sortenvv` to take `size_t`
  Try to more consistently use `size_t` for argument of `nclistlength`
  Try to more consistently use `size_t` for `nclistget` index argument
  Include header for `size_t` in `nclist.h`
Enables potential reuse of module outside of netCDF
@ZedThree
Copy link
Contributor Author

Thanks for the comments @LecrisUT, I think these are all sorted now. Merge conflicts also sorted

@ZedThree
Copy link
Contributor Author

I think the failing test here is just a flaky remote test

@WardF WardF merged commit 50a3ce0 into Unidata:main Mar 12, 2024
103 checks passed
@ZedThree ZedThree deleted the find_pnetcdf branch March 14, 2024 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants