From ce3caf4515054aa08e8a1068d2cf08bcfebf678b Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Mon, 19 Jul 2021 19:29:59 -0700
Subject: [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>
---
 versions/baseline.json   | 2 +-
 versions/e-/embree2.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'versions')

diff --git a/versions/baseline.json b/versions/baseline.json
index a068e8be6..cef33e4de 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1862,7 +1862,7 @@
     },
     "embree2": {
       "baseline": "2.17.7",
-      "port-version": 1
+      "port-version": 2
     },
     "embree3": {
       "baseline": "3.12.2",
diff --git a/versions/e-/embree2.json b/versions/e-/embree2.json
index c586f06ec..2502c3c01 100644
--- a/versions/e-/embree2.json
+++ b/versions/e-/embree2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cc259bcc8185631761c55b23d95afba48e8bae70",
+      "version-semver": "2.17.7",
+      "port-version": 2
+    },
     {
       "git-tree": "234d3da49438399d5df9e1a105401bc930ae22fe",
       "version-semver": "2.17.7",
-- 
cgit v1.2.3