Merge branch 'develop' into fix/remove-unused-arrays

AntaresSimulatorTeam · Jun 10, 2024 · b56355c · b56355c
2 parents 4a17ab7 + a121c75
commit b56355c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/cmake/common-settings.cmake b/src/cmake/common-settings.cmake
@@ -11,7 +11,7 @@ if (NOT WIN32)
 	set(COMMON_GCC_FLAGS "${COMMON_GCC_FLAGS} -Werror=return-type")
 endif()
 set(COMMON_MSVC_FLAGS "/W3 /MP4")
-set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /we4715 /we4716") #adding no return or no return for all code paths as errors
+set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /we4715 /we4716 /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR") #adding no return or no return for all code paths as errors
 set(ADDITIONAL_C_FLAGS " -Wconversion -Wmissing-prototypes -Wstrict-prototypes")
 set(ADDITIONAL_C_FLAGS "${ADDITIONAL_C_FLAGS} -Wmissing-noreturn -Wpacked -Wredundant-decls -Wbad-function-cast -W -Wcast-align -Wcast-qual -Wsign-compare -fno-exceptions -Wdeclaration-after-statement")