Merge pull request #696 from NOAA-GFDL/release/2020.04

Merge 2020.04.03 patch into master
NOAA-GFDL · Mar 8, 2021 · bf6adb5 · bf6adb5
2 parents 4dcc9a7 + d4724fa
commit bf6adb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ A unit test was added to test the functionality of `get_grid_version_1`
 - The autotools build has been changed to copy each subdirectory module (.mod) files to a common .mod directory located at the top of the source directory.  This change simplifies the include path specifications.
 - Use F90 module files for external libraries (MPI and NetCDF) for improved interface checking, thereby removing the reliance on library header include files.
 - FMS2_IO: Changed how nest file names are created to be consistent with mpp_io
+- CMAKE: Changed visibility of FMS OpenMP libraries to private in order to avoid conflicts with model libraries
 ### Removed
 - LIBFMS: The flag -Duse_mpp_io should not be used and will cause a crash
 - LIBFMS: Macros and logic for interfacing to the Flexible File I/O library

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -285,7 +285,7 @@ foreach(kind ${kinds})
                                          MPI::MPI_Fortran)
 
   if(OpenMP_Fortran_FOUND)
-    target_link_libraries(${libTgt} PUBLIC OpenMP::OpenMP_Fortran)
+    target_link_libraries(${libTgt} PRIVATE OpenMP::OpenMP_Fortran)
   endif()
 
   add_library(FMS::${libTgt} ALIAS ${libTgt})