summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-11 17:51:35 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-11 17:51:35 +0300
commitef9f4b38e976de1e2962b642155addb9ceab3aff (patch)
treee4cc0d1c35d485525ccac2e0e9b2fc0afd601389 /indra/cmake
parentf25440c8f068ec819505991e353873b3dda4e46e (diff)
parentf5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff)
Merge branch 'main' into DRTVWR-600-maint-A
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/00-Common.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 690159583a..4471380c6b 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -103,6 +103,11 @@ if (WINDOWS)
string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif()
+
+ # workaround for github runner image breakage:
+ # https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161
+ # can be removed after the above issue is resolved and deployed across GHA
+ add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
endif (WINDOWS)