diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-07-19 19:29:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 19:29:59 -0700 |
| commit | ce3caf4515054aa08e8a1068d2cf08bcfebf678b (patch) | |
| tree | e11d72f75866080684fecb1fed4e86f9e3958d08 /scripts | |
| parent | 637ab6863dd3b93a8b6fe9d5761a347621d72f5d (diff) | |
| download | vcpkg-ce3caf4515054aa08e8a1068d2cf08bcfebf678b.tar.gz vcpkg-ce3caf4515054aa08e8a1068d2cf08bcfebf678b.zip | |
[embree2] Fix static linking (#18985)
* [embree2] Fix static linking
Recently attempting to build embree2 is causing our osx workers to die. Example recent CIs:
https://dev.azure.com/vcpkg/public/_build/results?buildId=56146
https://dev.azure.com/vcpkg/public/_build/results?buildId=55886
https://dev.azure.com/vcpkg/public/_build/results?buildId=55802
Notably, we don't see this problem in PRs because it is marked "fail" in ci.baseline.txt. Initially, I was going to change it to skip, but observed that the project uses an ordinary cmake build and all the failing triplets were static ones.
If this PR passes, the hope is that CI with this change will pass too.
* Disable embree2 more directly for mac and linux because the portfile isn't prepared for it.
* Small changes
* Update the baseline version
* Use string(COMPARE EQUAL for EMBREE_STATIC_RUNTIME as well.
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 12292644f..24f685e1c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -268,10 +268,6 @@ ecsutil:x64-osx=fail ecsutil:x64-uwp=fail # Checks for gnu extension so only works with gcc. elfutils:x64-osx=fail -embree2:x64-linux=fail -embree2:x64-osx=fail -embree2:x64-windows-static=fail -embree2:x64-windows-static-md=fail enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail |