From 3004382fdf545412482f80c70d17d6fc83712a80 Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Fri, 3 Feb 2023 08:53:13 +0800 Subject: [PATCH] [embree3] fix Unknown CMake command find_dependency (#29381) * fix Unknown CMake command find_dependency * x-add-version --- ports/embree3/portfile.cmake | 8 ++++---- ports/embree3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/embree3.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index f16638ceb5..4d59f5ee02 100755 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -53,7 +53,7 @@ vcpkg_cmake_configure( -DEMBREE_TUTORIALS=OFF -DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME} -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB} - -DEMBREE_INSTALL_DEPENDENCIES=OFF + -DEMBREE_INSTALL_DEPENDENCIES=OFF ) vcpkg_cmake_install() @@ -64,12 +64,12 @@ set(config_file "${CURRENT_PACKAGES_DIR}/share/embree/embree-config.cmake") file(READ "${config_file}" contents) string(REPLACE "SET(EMBREE_BUILD_TYPE Release)" "" contents "${contents}") string(REPLACE "/../../../" "/../../" contents "${contents}") -string(REPLACE "FIND_PACKAGE" "find_dependency" contents "${contents}") -string(REPLACE "REQUIRED" "" contents "${contents}") +string(REPLACE "FIND_PACKAGE" "include(CMakeFindDependencyMacro)\n find_dependency" contents "${contents}") +string(REPLACE "REQUIRED" "COMPONENTS" contents "${contents}") string(REPLACE "/lib/cmake/embree-${VERSION}" "/share/embree" contents "${contents}") if(NOT VCPKG_BUILD_TYPE) - string(REPLACE "/lib/embree3.lib" "$<$:/debug>/lib/embree3.lib" contents "${contents}") + string(REPLACE "/lib/embree3.lib" "$<$:/debug>/lib/embree3.lib" contents "${contents}") endif() file(WRITE "${config_file}" "${contents}") diff --git a/ports/embree3/vcpkg.json b/ports/embree3/vcpkg.json index 0c6271aa6f..5ee6379889 100644 --- a/ports/embree3/vcpkg.json +++ b/ports/embree3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "embree3", "version": "3.13.5", + "port-version": 1, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index df79f68e68..de674a1583 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2198,7 +2198,7 @@ }, "embree3": { "baseline": "3.13.5", - "port-version": 0 + "port-version": 1 }, "enet": { "baseline": "1.3.17", diff --git a/versions/e-/embree3.json b/versions/e-/embree3.json index efb5ddfc97..fabc52c154 100644 --- a/versions/e-/embree3.json +++ b/versions/e-/embree3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcd33aea68c2058b380f0617fe5524a3939c3ac7", + "version": "3.13.5", + "port-version": 1 + }, { "git-tree": "c4200bba761b3e04d73761b712080ade013f8763", "version": "3.13.5",