From 8e79563ea1a44688531c7b2c0cb8781579b4edb3 Mon Sep 17 00:00:00 2001
From: Seth Zegelstein <szegel@amazon.com>
Date: Sat, 11 Oct 2025 00:53:40 +0000
Subject: [PATCH] cmake: Fix conflicting optimization flags in debug builds

- Change CONFIG:Debug to CONFIG:debug for case sensitivity
- Remove trailing semicolons in flag lists
- Replace $<IF:...> with mutually exclusive $<$<condition>:...>
  for CUDA flags to avoid false branch evaluation on C++ files

Fixes debug builds incorrectly getting both -O0 and -O3 flags.

Signed-off-by: Seth Zegelstein <szegel@amazon.com>
---
 src/CMakeLists.txt        | 5 +++--
 src/device/CMakeLists.txt | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab6946b..4cc831d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -257,9 +257,10 @@ macro(nvshmem_library_set_base_config LIBNAME)
 
   target_compile_options(${LIBNAME}
     INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<BOOL:${NVSHMEM_VERBOSE}>>:-Xptxas -v>
-    PRIVATE $<IF:$<CONFIG:Debug>,-O0;-g;,-O3>
+    PRIVATE $<IF:$<CONFIG:debug>,-O0;-g,-O3>
     $<$<AND:$<BOOL:${NVSHMEM_VERBOSE}>,$<COMPILE_LANGUAGE:CUDA>>:-Xptxas -v>
-    $<IF:$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CONFIG:Debug>>,-O0;-g;-G;,-O3>
+    $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CONFIG:debug>>:-O0;-g;-G>
+    $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CONFIG:release>>:-O3>
     $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_PROCESSOR},"x86_64">,-msse,>
     $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<BOOL:${NVCC_THREADS}>>:-t4>
   )
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
index 73f3e2b..d0275e3 100644
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@ -139,9 +139,10 @@ macro(nvshmem_library_set_base_config LIBNAME)
 
   target_compile_options(${LIBNAME}
     INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<BOOL:${NVSHMEM_VERBOSE}>>:-Xptxas -v>
-    PRIVATE $<IF:$<CONFIG:Debug>,-O0;-g;,-O3>
+    PRIVATE $<IF:$<CONFIG:debug>,-O0;-g,-O3>
     $<$<AND:$<BOOL:${NVSHMEM_VERBOSE}>,$<COMPILE_LANGUAGE:CUDA>>:-Xptxas -v>
-    $<IF:$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CONFIG:Debug>>,-O0;-g;-G;,-O3>
+    $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CONFIG:debug>>:-O0;-g;-G>
+    $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CONFIG:release>>:-O3>
     $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_PROCESSOR},"x86_64">,-msse,>
     $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<BOOL:${NVCC_THREADS}>>:-t4>
   )