aboutsummaryrefslogtreecommitdiff
path: root/ports/embree2
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/embree2
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/embree2')
-rw-r--r--ports/embree2/CONTROL5
-rw-r--r--ports/embree2/cmake_policy.patch14
-rw-r--r--ports/embree2/portfile.cmake2
-rw-r--r--ports/embree2/vcpkg.json10
4 files changed, 26 insertions, 5 deletions
diff --git a/ports/embree2/CONTROL b/ports/embree2/CONTROL
deleted file mode 100644
index 0fe3df484..000000000
--- a/ports/embree2/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: embree2
-Version: 2.17.7
-Homepage: https://github.com/embree/embree
-Description: High Performance Ray Tracing Kernels.
-Build-Depends: tbb
diff --git a/ports/embree2/cmake_policy.patch b/ports/embree2/cmake_policy.patch
new file mode 100644
index 000000000..ed4d339e3
--- /dev/null
+++ b/ports/embree2/cmake_policy.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index afa704d..96dc4f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,9 @@ IF(COMMAND cmake_policy)
+ if (POLICY CMP0042)
+ cmake_policy(SET CMP0042 OLD)
+ endif()
++ if (POLICY CMP0001)
++ cmake_policy(SET CMP0001 OLD)
++ endif()
+ ENDIF(COMMAND cmake_policy)
+
+ MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake
index 728d73b86..1cb9b6bab 100644
--- a/ports/embree2/portfile.cmake
+++ b/ports/embree2/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
REF v2.17.7
SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873
HEAD_REF devel2
+ PATCHES
+ cmake_policy.patch
)
file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)
diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json
new file mode 100644
index 000000000..683e2eabb
--- /dev/null
+++ b/ports/embree2/vcpkg.json
@@ -0,0 +1,10 @@
+{
+ "name": "embree2",
+ "version-semver": "2.17.7",
+ "port-version": 1,
+ "description": "High Performance Ray Tracing Kernels.",
+ "homepage": "https://github.com/embree/embree",
+ "dependencies": [
+ "tbb"
+ ]
+}