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)