diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-11 16:03:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-11 17:42:17 -0700 |
| commit | 9775d7ea10ff87d913b1ba361a9204f961cd9c3f (patch) | |
| tree | 949da961836c451557c809469e4a1ffe4e540b3b /indra/cmake | |
| parent | a7b0f9391146b42dd5cd5f47f845de81bfdb6820 (diff) | |
| parent | 0870539264f7263ed17464413ee0b69058d511f6 (diff) | |
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/TinyEXR.cmake | 2 |
2 files changed, 6 insertions, 1 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) diff --git a/indra/cmake/TinyEXR.cmake b/indra/cmake/TinyEXR.cmake index e6d142d19d..e741c07f6e 100644 --- a/indra/cmake/TinyEXR.cmake +++ b/indra/cmake/TinyEXR.cmake @@ -3,5 +3,5 @@ include(Prebuilt) use_prebuilt_binary(tinyexr) -set(TINYEXR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinyexr) +set(TINYEXR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinyexr) |