Change MSVC std::mutex workaround #923
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarkCallow
added a commit
that referenced
this pull request
Jun 30, 2024
Unbelievable. While still wrangling with the workaround for the major GHA Windows runner image meltdown (PR #920 and blocked-by-this PR #923) Travis breaks their Ubuntu/arm64 runner image such that installs of python-related tools on to the VM are failing. This is their suggested workaround. I don't yet know if it will be needed permanently.
Move compiler info dump and recode to use cmake_print_variables. Disable dump of system and platform info in loadtests CMakeLists.txt.
It seems this code too calls the std::mutex constructor. Remove unneeded " around generator expressions for this define.
Remove from ktx-jni.
MarkCallow
force-pushed
the
mutex_workaround
branch
from
8562e2b
to
c270380
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of removing the older version of the vcruntime from the Temurin JVM installation in the GitHub Actions runner image, define
_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTORwhen compiling libktx and ${ASTCENC_LIB_TARGET}. This makes the code compatible with older VC runtimes removing the burden from users to ensure their JVM installation uses the latest VC runtime.See actions/runner-images#10055. For further background see actions/runner-images#10004 and https://developercommunity.visualstudio.com/t/Access-violation-in-_Thrd_yield-after-up/10664660#T-N10669129-N10678728.
Includes 2 other minor changes:
CMakeLists.txtto before first use of the compiler info and recode it to usecmake_print_variables.tests/loadtests/CMakeLists.txt.