From b4df47622e103c657a268d2f054b4fdf1692e57a Mon Sep 17 00:00:00 2001
From: Benson Ma <bensonma415@meta.com>
Date: Fri, 5 Sep 2025 08:31:33 -0700
Subject: [PATCH] Fix CXX_AVX2_FLAGS (#4823)

Summary:
X-link: https://github.com/facebookresearch/FBGEMM/pull/1851

- Remove quotes from CXX_AVX2_FLAGS to avoid compilation issue (see P1932287429)


Reviewed By: cthi

Differential Revision: D81732858

Pulled By: q10
---
 CMakeLists.txt              | 5 +++++
 cmake/modules/FindAVX.cmake | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c48da02a6..87d730c9d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,11 @@ include(GNUInstallDirs)
 # Check AVX
 set(CHECK_AVX_COMPILE ON)
 include(${MODULE_PATH}/FindAVX.cmake)
+# For some reason, AVX flag values end up being packed into a single quoted
+# string when FBGEMM is built as part of PyTorch build, so we need to separate
+# the flags here back into list-string format
+separate_arguments(CXX_AVX2_FLAGS)
+separate_arguments(CXX_AVX512_FLAGS)
 
 # Load Python
 find_package(Python)
diff --git a/cmake/modules/FindAVX.cmake b/cmake/modules/FindAVX.cmake
index 4fc3e08262..c9b15dc469 100644
--- a/cmake/modules/FindAVX.cmake
+++ b/cmake/modules/FindAVX.cmake
@@ -106,3 +106,7 @@ foreach(lang C;CXX)
     CHECK_SSE(${lang} "AVX512" "-mavx512f -mavx512dq -mavx512vl -mavx512bw -mfma;/arch:AVX512")
   endif()
 endforeach()
+
+MESSAGE(STATUS "CXX_AVX_FLAGS: ${CXX_AVX_FLAGS}")
+MESSAGE(STATUS "CXX_AVX2_FLAGS: ${CXX_AVX2_FLAGS}")
+MESSAGE(STATUS "CXX_AVX512_FLAGS: ${CXX_AVX512_FLAGS}")