From a5bc2526f646e625067e42fcdcc14188cbc591bb Mon Sep 17 00:00:00 2001
From: Earle Lowe <e.lowe@chia.net>
Date: Wed, 5 Feb 2025 10:05:25 -0800
Subject: [PATCH 1/3] update cmake with Og

---
 CMakeLists.txt | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 145383d89..656b461de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,41 +77,23 @@ ENDIF ()
 add_library(fse ${FSE_FILES})
 
 IF (MSVC)
-IF (CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /Oy")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2 /Oy")
+add_compile_options("$<$<CONFIG:Release>:/O2 /Oy>")
+add_compile_options("$<$<CONFIG:Debug>:/Ob1>")
+add_compile_options(/Zi)
 ELSE()
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ob1")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ob1")
-ENDIF()
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zi")
-
-ELSE()
-IF (CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
-ELSE()
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0")
-ENDIF()
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g")
-
+add_compile_options("$<$<CONFIG:Debug>:-Og>")
+add_compile_options("$<$<CONFIG:Release>:-O3>")
+add_compile_options(-Wall -g)
 ENDIF()
 
 IF (CMAKE_BUILD_TYPE STREQUAL "ASAN")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined")
-set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined")
+add_compile_options(-O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined)
+add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined)
 ENDIF()
 
 IF (CMAKE_BUILD_TYPE STREQUAL "TSAN")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fno-omit-frame-pointer -fsanitize=thread")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -fno-omit-frame-pointer -fsanitize=thread")
-set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fno-omit-frame-pointer -fsanitize=thread")
+add_compile_options(-O2 -fno-omit-frame-pointer -fsanitize=thread)
+add_link_options(-fno-omit-frame-pointer -fsanitize=thread)
 ENDIF()
 
 pybind11_add_module(chiapos ${CMAKE_CURRENT_SOURCE_DIR}/python-bindings/chiapos.cpp src/chacha8.c)

From 8caebdd23d6d79e16ea070d37f54ede2db2a3098 Mon Sep 17 00:00:00 2001
From: Earle Lowe <30607889+emlowe@users.noreply.github.com>
Date: Wed, 5 Feb 2025 13:02:31 -0800
Subject: [PATCH 2/3] Apply suggestions from code review

Co-authored-by: Amine Khaldi <amine.khaldi@reactos.org>
---
 CMakeLists.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 656b461de..1d05723f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,13 +77,18 @@ ENDIF ()
 add_library(fse ${FSE_FILES})
 
 IF (MSVC)
-add_compile_options("$<$<CONFIG:Release>:/O2 /Oy>")
-add_compile_options("$<$<CONFIG:Debug>:/Ob1>")
-add_compile_options(/Zi)
+add_compile_options(
+  "$<$<CONFIG:Release>:/O2 /Oy>"
+  "$<$<CONFIG:Debug>:/Ob1>"
+  /Zi
+)
 ELSE()
-add_compile_options("$<$<CONFIG:Debug>:-Og>")
-add_compile_options("$<$<CONFIG:Release>:-O3>")
-add_compile_options(-Wall -g)
+add_compile_options(
+  "$<$<CONFIG:Debug>:-Og>"
+  "$<$<CONFIG:Release>:-O3>"
+  -Wall
+  -g
+)
 ENDIF()
 
 IF (CMAKE_BUILD_TYPE STREQUAL "ASAN")

From 78c41b00b1d9a5a694ecc872cd202d5ee3d57441 Mon Sep 17 00:00:00 2001
From: Earle Lowe <30607889+emlowe@users.noreply.github.com>
Date: Wed, 5 Feb 2025 14:33:01 -0800
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Amine Khaldi <amine.khaldi@reactos.org>
---
 CMakeLists.txt | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d05723f5..a54fa4dc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,28 +77,28 @@ ENDIF ()
 add_library(fse ${FSE_FILES})
 
 IF (MSVC)
-add_compile_options(
-  "$<$<CONFIG:Release>:/O2 /Oy>"
-  "$<$<CONFIG:Debug>:/Ob1>"
-  /Zi
-)
+  add_compile_options(
+    "$<$<CONFIG:Release>:/O2 /Oy>"
+    "$<$<CONFIG:Debug>:/Ob1>"
+    /Zi
+  )
 ELSE()
-add_compile_options(
-  "$<$<CONFIG:Debug>:-Og>"
-  "$<$<CONFIG:Release>:-O3>"
-  -Wall
-  -g
-)
+  add_compile_options(
+    "$<$<CONFIG:Debug>:-Og>"
+    "$<$<CONFIG:Release>:-O3>"
+    -Wall
+    -g
+  )
 ENDIF()
 
 IF (CMAKE_BUILD_TYPE STREQUAL "ASAN")
-add_compile_options(-O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined)
-add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined)
+  add_compile_options(-O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined)
+  add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined)
 ENDIF()
 
 IF (CMAKE_BUILD_TYPE STREQUAL "TSAN")
-add_compile_options(-O2 -fno-omit-frame-pointer -fsanitize=thread)
-add_link_options(-fno-omit-frame-pointer -fsanitize=thread)
+  add_compile_options(-O2 -fno-omit-frame-pointer -fsanitize=thread)
+  add_link_options(-fno-omit-frame-pointer -fsanitize=thread)
 ENDIF()
 
 pybind11_add_module(chiapos ${CMAKE_CURRENT_SOURCE_DIR}/python-bindings/chiapos.cpp src/chacha8.c)