5 files changed, 220 insertions, 12 deletions
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL
index 77d06de9b..d27eefbcc 100644
--- a/ports/embree3/CONTROL
+++ b/ports/embree3/CONTROL
@@ -1,4 +1,5 @@
 Source: embree3
-Version: 3.5.2
+Version: 3.5.2-3
+Homepage: https://github.com/embree/embree
 Description: High Performance Ray Tracing Kernels.
 Build-Depends: tbb
diff --git a/ports/embree3/fix-InstallPath.patch b/ports/embree3/fix-InstallPath.patch
new file mode 100644
index 000000000..316fa594d
--- /dev/null
+++ b/ports/embree3/fix-InstallPath.patch
@@ -0,0 +1,15 @@
+diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
+index 3c3980d..0c365ac 100644
+--- a/common/cmake/package.cmake
++++ b/common/cmake/package.cmake
+@@ -124,8 +124,8 @@ CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cm
+ # create a config file for the build directory
+ CONFIGURE_FILE(common/cmake/embree-config-builddir.cmake embree-config.cmake @ONLY)
+ 
+-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} RENAME "embree-config.cmake" COMPONENT devel)
+-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 RENAME "embree-config.cmake" COMPONENT devel)
++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 COMPONENT devel)
+ 
+ ##############################################################
+ # CPack specific stuff
diff --git a/ports/embree3/fix-cmake-path.patch b/ports/embree3/fix-cmake-path.patch
new file mode 100644
index 000000000..e1e65eda3
--- /dev/null
+++ b/ports/embree3/fix-cmake-path.patch
@@ -0,0 +1,163 @@
+diff --git a/common/lexers/CMakeLists.txt b/common/lexers/CMakeLists.txt
+index 10c8caf..95d96dc 100644
+--- a/common/lexers/CMakeLists.txt
++++ b/common/lexers/CMakeLists.txt
+@@ -23,7 +23,7 @@ SET_PROPERTY(TARGET lexers PROPERTY FOLDER common)
+ SET_PROPERTY(TARGET lexers APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+ 
+ IF (EMBREE_STATIC_LIB)
+-  INSTALL(TARGETS lexers EXPORT lexers-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-  INSTALL(EXPORT lexers-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++  INSTALL(TARGETS lexers EXPORT lexers-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++  INSTALL(EXPORT lexers-targets DESTINATION share/embree3 COMPONENT devel)
+   SIGN_TARGET(lexers)
+ ENDIF()
+diff --git a/common/math/CMakeLists.txt b/common/math/CMakeLists.txt
+index e7ed3b1..13247ca 100644
+--- a/common/math/CMakeLists.txt
++++ b/common/math/CMakeLists.txt
+@@ -19,8 +19,8 @@ SET_PROPERTY(TARGET math PROPERTY FOLDER common)
+ SET_PROPERTY(TARGET math APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+ 
+ IF (EMBREE_STATIC_LIB)
+-  INSTALL(TARGETS math EXPORT math-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-  INSTALL(EXPORT math-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++  INSTALL(TARGETS math EXPORT math-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++  INSTALL(EXPORT math-targets DESTINATION share/embree3 COMPONENT devel)
+   SIGN_TARGET(math)
+ ENDIF()
+ 
+diff --git a/common/simd/CMakeLists.txt b/common/simd/CMakeLists.txt
+index 5b1658c..81d7c80 100644
+--- a/common/simd/CMakeLists.txt
++++ b/common/simd/CMakeLists.txt
+@@ -19,7 +19,7 @@ SET_PROPERTY(TARGET simd PROPERTY FOLDER common)
+ SET_PROPERTY(TARGET simd APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+ 
+ IF (EMBREE_STATIC_LIB)
+-  INSTALL(TARGETS simd EXPORT simd-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-  INSTALL(EXPORT simd-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++  INSTALL(TARGETS simd EXPORT simd-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++  INSTALL(EXPORT simd-targets DESTINATION share/embree3 COMPONENT devel)
+   SIGN_TARGET(simd)
+ ENDIF()
+diff --git a/common/sys/CMakeLists.txt b/common/sys/CMakeLists.txt
+index e0e0848..b57e6be 100644
+--- a/common/sys/CMakeLists.txt
++++ b/common/sys/CMakeLists.txt
+@@ -35,7 +35,7 @@ SET_PROPERTY(TARGET sys PROPERTY FOLDER common)
+ SET_PROPERTY(TARGET sys APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+ 
+ IF (EMBREE_STATIC_LIB)
+-  INSTALL(TARGETS sys EXPORT sys-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-  INSTALL(EXPORT sys-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++  INSTALL(TARGETS sys EXPORT sys-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++  INSTALL(EXPORT sys-targets DESTINATION share/embree3 COMPONENT devel)
+   SIGN_TARGET(sys)
+ ENDIF()
+diff --git a/common/tasking/CMakeLists.txt b/common/tasking/CMakeLists.txt
+index f5db33f..b96671a 100644
+--- a/common/tasking/CMakeLists.txt
++++ b/common/tasking/CMakeLists.txt
+@@ -28,7 +28,7 @@ SET_PROPERTY(TARGET tasking PROPERTY FOLDER common)
+ SET_PROPERTY(TARGET tasking APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
+ 
+ IF (EMBREE_STATIC_LIB)
+-  INSTALL(TARGETS tasking EXPORT tasking-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-  INSTALL(EXPORT tasking-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++  INSTALL(TARGETS tasking EXPORT tasking-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++  INSTALL(EXPORT tasking-targets DESTINATION share/embree3 COMPONENT devel)
+   SIGN_TARGET(tasking)
+ ENDIF()
+diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
+index a5774d2..b637321 100644
+--- a/kernels/CMakeLists.txt
++++ b/kernels/CMakeLists.txt
+@@ -255,8 +255,8 @@ IF (EMBREE_ISA_SSE42 AND EMBREE_LIBRARY_FILES_SSE42)
+   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_sse42)
+   CheckGlobals(embree_sse42)
+   IF (EMBREE_STATIC_LIB)
+-    INSTALL(TARGETS embree_sse42 EXPORT embree_sse42-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-    INSTALL(EXPORT embree_sse42-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++    INSTALL(TARGETS embree_sse42 EXPORT embree_sse42-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++    INSTALL(EXPORT embree_sse42-targets DESTINATION share/embree3 COMPONENT devel)
+   ENDIF()
+ ENDIF ()
+ 
+@@ -268,8 +268,8 @@ IF (EMBREE_ISA_AVX  AND EMBREE_LIBRARY_FILES_AVX)
+   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx)
+   CheckGlobals(embree_avx)
+   IF (EMBREE_STATIC_LIB)
+-    INSTALL(TARGETS embree_avx EXPORT embree_avx-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-    INSTALL(EXPORT embree_avx-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++    INSTALL(TARGETS embree_avx EXPORT embree_avx-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++    INSTALL(EXPORT embree_avx-targets DESTINATION share/embree3 COMPONENT devel)
+   ENDIF()
+ ENDIF()
+ 
+@@ -281,8 +281,8 @@ IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2)
+   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx2)
+   CheckGlobals(embree_avx2)
+   IF (EMBREE_STATIC_LIB)
+-    INSTALL(TARGETS embree_avx2 EXPORT embree_avx2-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-    INSTALL(EXPORT embree_avx2-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++    INSTALL(TARGETS embree_avx2 EXPORT embree_avx2-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++    INSTALL(EXPORT embree_avx2-targets DESTINATION share/embree3 COMPONENT devel)
+   ENDIF()
+ ENDIF()
+ 
+@@ -294,8 +294,8 @@ IF (EMBREE_ISA_AVX512KNL AND EMBREE_LIBRARY_FILES_AVX512KNL)
+   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx512knl)
+   CheckGlobals(embree_avx512knl)
+   IF (EMBREE_STATIC_LIB)
+-    INSTALL(TARGETS embree_avx512knl EXPORT embree_avx512knl-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-    INSTALL(EXPORT embree_avx512knl-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++    INSTALL(TARGETS embree_avx512knl EXPORT embree_avx512knl-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++    INSTALL(EXPORT embree_avx512knl-targets DESTINATION share/embree3 COMPONENT devel)
+   ENDIF()
+ ENDIF()
+ 
+@@ -307,8 +307,8 @@ IF (EMBREE_ISA_AVX512SKX AND EMBREE_LIBRARY_FILES_AVX512SKX)
+   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx512skx)
+   CheckGlobals(embree_avx512skx)
+   IF (EMBREE_STATIC_LIB)
+-    INSTALL(TARGETS embree_avx512skx EXPORT embree_avx512skx-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+-    INSTALL(EXPORT embree_avx512skx-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++    INSTALL(TARGETS embree_avx512skx EXPORT embree_avx512skx-targets DESTINATION share/embree3 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
++    INSTALL(EXPORT embree_avx512skx-targets DESTINATION share/embree3 COMPONENT devel)
+   ENDIF()
+ ENDIF()
+ 
+@@ -331,7 +331,7 @@ ELSE()
+   SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION} SOVERSION ${EMBREE_VERSION_MAJOR})
+ ENDIF()
+ 
+-INSTALL(TARGETS embree EXPORT embree-targets
++INSTALL(TARGETS embree EXPORT embree-targets DESTINATION share/embree3
+   LIBRARY NAMELINK_SKIP DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
+   # on Windows put the dlls into bin
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples
+@@ -340,7 +340,7 @@ INSTALL(TARGETS embree EXPORT embree-targets
+ )
+ 
+ IF (EMBREE_STATIC_LIB)
+-  INSTALL(EXPORT embree-targets DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++  INSTALL(EXPORT embree-targets DESTINATION share/embree3 COMPONENT devel)
+ ENDIF()
+ 
+ IF (NOT EMBREE_STATIC_LIB)
+diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
+index 0c365ac..7b140a5 100644
+--- a/common/cmake/package.cmake
++++ b/common/cmake/package.cmake
+@@ -124,8 +124,8 @@ CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cm
+ # create a config file for the build directory
+ CONFIGURE_FILE(common/cmake/embree-config-builddir.cmake embree-config.cmake @ONLY)
+ 
+-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 RENAME "embree-config.cmake" COMPONENT devel)
+-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 COMPONENT devel)
++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION share/embree3 RENAME "embree-config.cmake" COMPONENT devel)
++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION share/embree3 COMPONENT devel)
+ 
+ ##############################################################
+ # CPack specific stuff
diff --git a/ports/embree3/fix-embree-path.patch b/ports/embree3/fix-embree-path.patch
new file mode 100644
index 000000000..316112755
--- /dev/null
+++ b/ports/embree3/fix-embree-path.patch
@@ -0,0 +1,26 @@
+diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
+index cab4d41..da84d3d 100644
+--- a/common/cmake/embree-config.cmake
++++ b/common/cmake/embree-config.cmake
+@@ -14,11 +14,19 @@
+ ## limitations under the License.                                           ##
+ ## ======================================================================== ##
+ 
+-SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)
++SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../@EMBREE_RELATIV_ROOT_DIR@)
+ GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
+ 
+ SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
+-SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
++
++IF (CMAKE_BUILD_TYPE STREQUAL Debug)
++    SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/debug/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
++ENDIF ()
++
++IF (CMAKE_BUILD_TYPE STREQUAL Release)
++    SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
++ENDIF ()
++
+ SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
+ 
+ MARK_AS_ADVANCED(embree_DIR)
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index 142be6cd6..32deef693 100644
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -6,6 +6,10 @@ vcpkg_from_github(
     REF v3.5.2
     SHA512 f00403c8bc76428088a38990117245b5b11ac90a2df21fa12c2d5c2e8af45fb3708abb705c612e0d9d7b0cfe4edb51c8b9630b60081b39fcb4370f31ee37acc7
     HEAD_REF master
+    PATCHES
+        fix-InstallPath.patch
+        fix-cmake-path.patch
+        fix-embree-path.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)
@@ -16,6 +20,12 @@ else()
     set(EMBREE_STATIC_RUNTIME OFF)
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(EMBREE_STATIC_LIB ON)
+else()
+    set(EMBREE_STATIC_LIB OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
@@ -24,6 +34,7 @@ vcpkg_configure_cmake(
         -DEMBREE_ISPC_SUPPORT=OFF
         -DEMBREE_TUTORIALS=OFF
         -DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME}
+        -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB}
         "-DTBB_LIBRARIES=TBB::tbb"
         "-DTBB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include"
 )
@@ -33,20 +44,12 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-# these cmake files do not seem to contain helpful configuration for find libs, just remove them
-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)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/embree3 TARGET_PATH share/embree)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models)
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree3)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree3/doc)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree/doc)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree3)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree3/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)