aboutsummaryrefslogtreecommitdiff
path: root/ports/embree3
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-05-20 05:05:43 +0800
committerGitHub <noreply@github.com>2021-05-19 14:05:43 -0700
commitc99dc50be99c9656502d140e1d785a267ab233a4 (patch)
tree84bb9de6c33b93fc965dbde7915a53bf18ffea97 /ports/embree3
parent3738723dd22fcba69c3f16497d4696aee0f48b51 (diff)
downloadvcpkg-c99dc50be99c9656502d140e1d785a267ab233a4.tar.gz
vcpkg-c99dc50be99c9656502d140e1d785a267ab233a4.zip
[vcpkg baseline][many ports] Fix build error (#17983)
* [vcpkg baseline][wxwidgets] Fix build error * [mlpack] Fix configure error (upstream bug) * [vcpkg baseline] [embree2/embree3] Set cmake policy * Remove control file * Update baseline version * [mlpack] Re-write the dependency * [mlpack] Remove dependency boost-test since only feature test need it, add more boost dependencies. * [mlpack] Add dependency boost-heap * [mlpack] Fix uwp build * update version record * [mlpack] Revert uwp fix * update version record * [mlpack] Remove dependency boost-test * update version record * update baseline * [clamav] Update hash * update version record Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/embree3')
-rw-r--r--ports/embree3/cmake_policy.patch14
-rwxr-xr-xports/embree3/portfile.cmake1
-rw-r--r--ports/embree3/vcpkg.json3
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/embree3/cmake_policy.patch b/ports/embree3/cmake_policy.patch
new file mode 100644
index 000000000..0ae3a074d
--- /dev/null
+++ b/ports/embree3/cmake_policy.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06f49a8..fdaaee7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,6 +69,9 @@ IF(COMMAND cmake_policy)
+ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW)
+ endif()
++ if (POLICY CMP0001)
++ cmake_policy(SET CMP0001 OLD)
++ endif()
+ ENDIF(COMMAND cmake_policy)
+
+ MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index 522caaa0f..b5d08c792 100755
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
PATCHES
fix-path.patch
fix-static-usage.patch
+ cmake_policy.patch
)
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static EMBREE_STATIC_LIB)
diff --git a/ports/embree3/vcpkg.json b/ports/embree3/vcpkg.json
index cec4212db..8730d6a0e 100644
--- a/ports/embree3/vcpkg.json
+++ b/ports/embree3/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "embree3",
- "version": "3.12.2",
+ "version-semver": "3.12.2",
+ "port-version": 1,
"description": "High Performance Ray Tracing Kernels.",
"homepage": "https://github.com/embree/embree",
"dependencies": [