Merge branch 'develop' into as_wgrib

NOAA-EMC · Oct 18, 2024 · 7323d2d · 7323d2d
2 parents 547be6c + 47af6ac
commit 7323d2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,13 +114,7 @@ endif()
 
 message(STATUS "Checking if the user want to use OpenMP...")
 if(USE_OPENMP)
-  find_package(OpenMP)
-  if(OpenMP_CXX_FOUND)
-     target_link_libraries(MyTarget PUBLIC OpenMP::OpenMP_CXX)
-  endif()
-#  if(OpenMP_Fortran_FOUND)
-#     target_link_libraries(MyTarget PUBLIC OpenMP::OpenMP_Fortran)
-#  endif()
+  find_package(OpenMP REQUIRED COMPONENTS C)
 endif()
 
 message(STATUS "Checking if the user wants to use PNG...")

diff --git a/wgrib2/CMakeLists.txt b/wgrib2/CMakeLists.txt
@@ -92,7 +92,7 @@ if(USE_PNG)
   target_link_libraries(obj_lib PUBLIC PNG::PNG)
 endif()
 
-if(OpenMP_C_FOUND)
+if(USE_OPENMP)
   target_link_libraries(obj_lib PUBLIC OpenMP::OpenMP_C)
 endif()
 
@@ -116,7 +116,7 @@ target_link_libraries(obj_lib PUBLIC gctpc -lm)
 target_link_libraries(wgrib2_exe PRIVATE gctpc)
 
 if(USE_AEC)
-  target_link_libraries(wgrib2_exe PRIVATE aec)
+  target_link_libraries(wgrib2_exe PRIVATE ${LIBAEC_LIBRARIES})
 endif()
 
 if(USE_JASPER)