From a24b7538ad5b40fa8ccc1cda384fc421dbf6d47c Mon Sep 17 00:00:00 2001
From: Ming Chen <ming.chen1@noaa.gov>
Date: Tue, 4 Nov 2025 02:33:19 +0000
Subject: [PATCH 1/2] fix Intel building warning #10121

---
 model/src/CMakeLists.txt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/model/src/CMakeLists.txt b/model/src/CMakeLists.txt
index 59dec391c2..e57a78803e 100644
--- a/model/src/CMakeLists.txt
+++ b/model/src/CMakeLists.txt
@@ -206,9 +206,17 @@ foreach(program ${programs})
   target_link_libraries(${program} PRIVATE ww3_lib)
 endforeach()
 
-target_compile_options(ww3_lib PUBLIC "$<$<COMPILE_LANGUAGE:Fortran>:${compile_flags}>")
-target_compile_options(ww3_lib PUBLIC "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_debug}>")
-target_compile_options(ww3_lib PUBLIC "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_release}>")
+if ("PIO" IN_LIST switches)
+  # Building as part of UFS (submodule)
+  set(WW3_FLAG_SCOPE PRIVATE)
+else()
+  # Standalone WW3 build
+  set(WW3_FLAG_SCOPE PUBLIC)
+endif()
+
+target_compile_options(ww3_lib ${WW3_FLAG_SCOPE} "$<$<COMPILE_LANGUAGE:Fortran>:${compile_flags}>")
+target_compile_options(ww3_lib ${WW3_FLAG_SCOPE} "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_debug}>")
+target_compile_options(ww3_lib ${WW3_FLAG_SCOPE} "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${compile_flags_release}>")
 
 install(
   TARGETS ${programs} ww3_lib

From c3fe39ee7fcb01614e2f1c6b4ea10305e09b72ef Mon Sep 17 00:00:00 2001
From: Ming Chen <ming.chen1@noaa.gov>
Date: Tue, 4 Nov 2025 14:15:09 +0000
Subject: [PATCH 2/2] switch conditional logic to UFS_CAP

---
 model/src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/src/CMakeLists.txt b/model/src/CMakeLists.txt
index e57a78803e..63b95f933f 100644
--- a/model/src/CMakeLists.txt
+++ b/model/src/CMakeLists.txt
@@ -206,7 +206,7 @@ foreach(program ${programs})
   target_link_libraries(${program} PRIVATE ww3_lib)
 endforeach()
 
-if ("PIO" IN_LIST switches)
+if (UFS_CAP)
   # Building as part of UFS (submodule)
   set(WW3_FLAG_SCOPE PRIVATE)
 else()