From 28b7fa1d13474f42c766b947c24c6ca9e04fb9b5 Mon Sep 17 00:00:00 2001 From: kcbanner Date: Sun, 4 Sep 2022 13:26:03 -0400 Subject: [PATCH] msvc: fixup compiler arg generation, as /O2 is incompatible with /RTC1 --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 336ad0637b..7de04a9492 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,8 +309,14 @@ set(EMBEDDED_SOFTFLOAT_SOURCES ) add_library(embedded_softfloat STATIC ${EMBEDDED_SOFTFLOAT_SOURCES}) if(MSVC) + set(SOFTFLOAT_CFLAGS "/w") + + if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(SOFTFLOAT_CFLAGS "${SOFTFLOAT_CFLAGS} /O2") + endif() + set_target_properties(embedded_softfloat PROPERTIES - COMPILE_FLAGS "/w /O2" + COMPILE_FLAGS ${SOFTFLOAT_CFLAGS} ) else() set_target_properties(embedded_softfloat PROPERTIES @@ -871,7 +877,9 @@ else() endif() if(MSVC) - set(OPTIMIZED_C_FLAGS "/O2") + if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(OPTIMIZED_C_FLAGS "/O2") + endif() else(MSVC) set(OPTIMIZED_C_FLAGS "-std=c99 -O3") endif(MSVC)