diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-01-11 02:47:09 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-10 10:47:09 -0800 |
| commit | 7dc8ecbc08eed912fe1952c3d462cfc683931060 (patch) | |
| tree | e81f7169160724594a6d365d21e5098b6b882284 | |
| parent | e8c662de4704dc980703bded87f69e1a37278700 (diff) | |
| download | vcpkg-7dc8ecbc08eed912fe1952c3d462cfc683931060.tar.gz vcpkg-7dc8ecbc08eed912fe1952c3d462cfc683931060.zip | |
[azure-kinect-sensor-sdk] Remove feature test and fix static build in Windows (#9458)
* [azure-kinect-sensor] Remove feature test and fix static build in Windows
* [azure-kinect-sensor-sdk] Re-fix components install path using patch
* [azure-kinect-sensor-sdk] Remove bin debug/bin in static build
* update baseline
| -rw-r--r-- | ports/azure-kinect-sensor-sdk/CONTROL | 7 | ||||
| -rw-r--r-- | ports/azure-kinect-sensor-sdk/fix-components-path.patch | 26 | ||||
| -rw-r--r-- | ports/azure-kinect-sensor-sdk/portfile.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
4 files changed, 38 insertions, 7 deletions
diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL index 96cbfa03c..015a3118f 100644 --- a/ports/azure-kinect-sensor-sdk/CONTROL +++ b/ports/azure-kinect-sensor-sdk/CONTROL @@ -1,5 +1,5 @@ Source: azure-kinect-sensor-sdk -Version: 1.4.0-alpha.0 +Version: 1.4.0-alpha.0-1 Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device. Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv @@ -9,7 +9,4 @@ Description: Build K4A doxygen documentation. Feature: tool Description: Build tools. -Build-Depends: gl3w, imgui[example] - -Feature: test -Description: Build test projects.
\ No newline at end of file +Build-Depends: gl3w, imgui[example]
\ No newline at end of file diff --git a/ports/azure-kinect-sensor-sdk/fix-components-path.patch b/ports/azure-kinect-sensor-sdk/fix-components-path.patch new file mode 100644 index 000000000..a8aa0773e --- /dev/null +++ b/ports/azure-kinect-sensor-sdk/fix-components-path.patch @@ -0,0 +1,26 @@ +diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt +index 4be0697..d30c6de 100644 +--- a/src/record/sdk/CMakeLists.txt ++++ b/src/record/sdk/CMakeLists.txt +@@ -81,7 +81,7 @@ install( + development + RUNTIME + DESTINATION +- ${CMAKE_INSTALL_BINDIR} ++ tools + COMPONENT + runtime + ) +diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt +index 3616f40..a5019cb 100644 +--- a/src/sdk/CMakeLists.txt ++++ b/src/sdk/CMakeLists.txt +@@ -90,7 +90,7 @@ install( + development + RUNTIME + DESTINATION +- ${CMAKE_INSTALL_BINDIR} ++ tools + COMPONENT + runtime + ) diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 8dfa81569..3c94f7dc3 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -7,11 +7,15 @@ vcpkg_from_github( PATCHES fix-builds.patch disable-c4275.patch + fix-components-path.patch ) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS docs K4A_BUILD_DOCS - test WITH_TEST tool BUILD_TOOLS ) @@ -22,6 +26,7 @@ vcpkg_configure_cmake( -DK4A_SOURCE_LINK=OFF -DK4A_MTE_VERSION=ON -DBUILD_EXAMPLES=OFF + -DWITH_TEST=OFF ) vcpkg_install_cmake() @@ -36,5 +41,9 @@ vcpkg_copy_pdbs() 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() + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6dec59170..242f7eb02 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -113,7 +113,6 @@ aws-lambda-cpp:x86-windows=fail aws-sdk-cpp:x64-linux=ignore
azure-c-shared-utility:arm-uwp=fail
azure-c-shared-utility:x64-uwp=fail
-azure-kinect-sensor-sdk:x64-windows-static=fail
basisu:x64-linux=ignore
bde:arm64-windows=fail
bde:arm-uwp=fail
|
