authorgravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2022-09-04 13:26:03-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-10-12 05:31:48-04:00
log28b7fa1d13474f42c766b947c24c6ca9e04fb9b5
tree9ad98b64f1b26b01f2a5411ed89b17f10f79281b
parentd08191e146a63d8f9de15f33f92a992f96d021c0

msvc: fixup compiler arg generation, as /O2 is incompatible with /RTC1

1 files changed, 10 insertions(+), 2 deletions(-)

CMakeLists.txt+10-2
...@@ -309,8 +309,14 @@ set(EMBEDDED_SOFTFLOAT_SOURCES...@@ -309,8 +309,14 @@ set(EMBEDDED_SOFTFLOAT_SOURCES
309)309)
310add_library(embedded_softfloat STATIC ${EMBEDDED_SOFTFLOAT_SOURCES})310add_library(embedded_softfloat STATIC ${EMBEDDED_SOFTFLOAT_SOURCES})
311if(MSVC)311if(MSVC)
312 set(SOFTFLOAT_CFLAGS "/w")
313
314 if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
315 set(SOFTFLOAT_CFLAGS "${SOFTFLOAT_CFLAGS} /O2")
316 endif()
317
312 set_target_properties(embedded_softfloat PROPERTIES318 set_target_properties(embedded_softfloat PROPERTIES
313 COMPILE_FLAGS "/w /O2"319 COMPILE_FLAGS ${SOFTFLOAT_CFLAGS}
314 )320 )
315else()321else()
316 set_target_properties(embedded_softfloat PROPERTIES322 set_target_properties(embedded_softfloat PROPERTIES
...@@ -871,7 +877,9 @@ else()...@@ -871,7 +877,9 @@ else()
871endif()877endif()
872878
873if(MSVC)879if(MSVC)
874 set(OPTIMIZED_C_FLAGS "/O2")880 if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
881 set(OPTIMIZED_C_FLAGS "/O2")
882 endif()
875else(MSVC)883else(MSVC)
876 set(OPTIMIZED_C_FLAGS "-std=c99 -O3")884 set(OPTIMIZED_C_FLAGS "-std=c99 -O3")
877endif(MSVC)885endif(MSVC)