From f24273378dda5d7b7a612074333a7a0cf8d341bb Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:09:27 +0100 Subject: [PATCH] MSVC build: fixed release compiler flags --- cmake/flags.cmake | 2 +- external/src/Tari/CMakeLists.txt | 4 ++-- external/src/curl | 2 +- external/src/grpc | 2 +- external/src/libuv | 2 +- external/src/libzmq | 2 +- external/src/miniupnp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/flags.cmake b/cmake/flags.cmake index dab9fc2..726b809 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -60,7 +60,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(GENERAL_FLAGS "/MP /EHa") set(WARNING_FLAGS "/Wall /WX /sdl") set(SECURITY_FLAGS "/GS /guard:cf") - set(OPTIMIZATION_FLAGS "/O2 /Oi /Ob2 /Ot /DNDEBUG /GL") + set(OPTIMIZATION_FLAGS "/O2 /Oi /Ob2 /Ot /Oy /DNDEBUG /GL") if (DISABLE_WARNINGS) set(WARNING_FLAGS "/W0") diff --git a/external/src/Tari/CMakeLists.txt b/external/src/Tari/CMakeLists.txt index 3963e77..b8e0633 100644 --- a/external/src/Tari/CMakeLists.txt +++ b/external/src/Tari/CMakeLists.txt @@ -39,8 +39,8 @@ include_directories(../grpc/third_party/abseil-cpp) if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /GL /MT") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /GL /MT") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /GL /MT /GS /guard:cf") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /GL /MT /GS /guard:cf") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT") else() diff --git a/external/src/curl b/external/src/curl index bf3206d..d644f86 160000 --- a/external/src/curl +++ b/external/src/curl @@ -1 +1 @@ -Subproject commit bf3206df3a78919204b5c364c2a1fe6f5ea7bf1a +Subproject commit d644f8624251a50a7640dbb957aa08d39cc58160 diff --git a/external/src/grpc b/external/src/grpc index cad26a7..e22a758 160000 --- a/external/src/grpc +++ b/external/src/grpc @@ -1 +1 @@ -Subproject commit cad26a724483462038a29c35381fc0cc9df9f8fd +Subproject commit e22a758b13217b9c88372d0f1f747b9ef20debf3 diff --git a/external/src/libuv b/external/src/libuv index a43eeec..bf762bb 160000 --- a/external/src/libuv +++ b/external/src/libuv @@ -1 +1 @@ -Subproject commit a43eeec0236680fc6f1b86ddc4534a991105a0d7 +Subproject commit bf762bb18b8edaf798a9bce5209b0960a2305080 diff --git a/external/src/libzmq b/external/src/libzmq index b05020c..8a20bd6 160000 --- a/external/src/libzmq +++ b/external/src/libzmq @@ -1 +1 @@ -Subproject commit b05020c66eeef9db5005a17497163b7aa107ccdb +Subproject commit 8a20bd6132b3a93562fbf72736739c02a0cc93c3 diff --git a/external/src/miniupnp b/external/src/miniupnp index 444861a..f5ea6fb 160000 --- a/external/src/miniupnp +++ b/external/src/miniupnp @@ -1 +1 @@ -Subproject commit 444861a6b177b9275aa1f179f42b186daf776439 +Subproject commit f5ea6fb1aae411a5c839dadc3f52b21f2eab25f5