diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-09-17 17:20:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 08:20:57 -0700 |
| commit | 66dc12b3fa1863bf60afe75f2cfdd41298e52ee5 (patch) | |
| tree | 97c854b2bc6e784a5f41def106f9c336ebb14490 /ports/embree2 | |
| parent | 8a943f71ffb6d99ac8800b71172d4eff2d0c6df4 (diff) | |
| download | vcpkg-66dc12b3fa1863bf60afe75f2cfdd41298e52ee5.tar.gz vcpkg-66dc12b3fa1863bf60afe75f2cfdd41298e52ee5.zip | |
many-ports: Update supports field (#20053)
* many-ports: Update supports field
* Fix several "version-string"s.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/embree2')
| -rw-r--r-- | ports/embree2/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/embree2/vcpkg.json | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake index 3c38547f8..fc1e8384e 100644 --- a/ports/embree2/portfile.cmake +++ b/ports/embree2/portfile.cmake @@ -13,10 +13,9 @@ file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DEMBREE_ISPC_SUPPORT=OFF -DEMBREE_TUTORIALS=OFF @@ -28,7 +27,7 @@ vcpkg_configure_cmake( # just wait, the release build of embree is insanely slow in MSVC # a single file will took about 2-10 min -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # these cmake files do not seem to contain helpful configuration for find libs, just remove them @@ -36,6 +35,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json index 2ca350964..e7fdad98d 100644 --- a/ports/embree2/vcpkg.json +++ b/ports/embree2/vcpkg.json @@ -1,11 +1,14 @@ { "name": "embree2", "version-semver": "2.17.7", - "port-version": 2, + "port-version": 3, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", - "supports": "windows", "dependencies": [ - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + } ] } |