aboutsummaryrefslogtreecommitdiff
path: root/ports/embree3
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2020-02-04 15:50:10 -0800
committerRobert Schumacher <roschuma@microsoft.com>2020-02-04 15:50:10 -0800
commit6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch)
tree0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /ports/embree3
parentd502f061bb3ee0258d6453acbf258b9e5d93d564 (diff)
parentd808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff)
downloadvcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz
vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/embree3')
-rw-r--r--ports/embree3/CONTROL2
-rw-r--r--ports/embree3/portfile.cmake9
2 files changed, 10 insertions, 1 deletions
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL
index c3c0c0bd6..e3c014636 100644
--- a/ports/embree3/CONTROL
+++ b/ports/embree3/CONTROL
@@ -1,5 +1,5 @@
Source: embree3
-Version: 3.6.1
+Version: 3.6.1-1
Homepage: https://github.com/embree/embree
Description: High Performance Ray Tracing Kernels.
Build-Depends: tbb
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index 56ed32f0c..f274f0c7d 100644
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -48,6 +48,15 @@ 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)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+if (EXISTS ${CURRENT_PACKAGES_DIR}/uninstall.command)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/uninstall.command)
+endif()
+if (EXISTS ${CURRENT_PACKAGES_DIR}/debug/uninstall.command)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/uninstall.command)
+endif()
file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree/doc)