From bf3e071e53bf46cba8857859f853dcc8898db817 Mon Sep 17 00:00:00 2001 From: Fabio Pellacini Date: Fri, 17 Jan 2020 07:56:33 +0100 Subject: [embree3] added cleanup command for static build (#9555) * added cleanup command to embree3 port for static build * updated CONTROL file with version tag * check if file exists before cleanups * fix baseline Co-authored-by: nicole mazzuca --- ports/embree3/CONTROL | 2 +- ports/embree3/portfile.cmake | 9 +++++++++ scripts/ci.baseline.txt | 1 - 3 files changed, 10 insertions(+), 2 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) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c4889fbc6..ab88ed6f6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -402,7 +402,6 @@ ecsutil:x64-uwp=fail embree2:x64-linux=fail embree2:x64-osx=fail embree2:x64-windows-static=fail -embree3:x64-osx=fail enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail -- cgit v1.2.3