From 47ecc3ede88ce09cb0e3177fe2615d72751d593c Mon Sep 17 00:00:00 2001 From: Wingkou Date: Sat, 4 Jan 2020 15:42:27 +0800 Subject: [PATCH 1/2] add opengl, opencl and cuda features for libfreenect2 --- ports/libfreenect2/CONTROL | 15 ++++++++++++++- ports/libfreenect2/portfile.cmake | 9 ++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ports/libfreenect2/CONTROL b/ports/libfreenect2/CONTROL index 6734e25cc63df7..cf4ea88183a8f8 100644 --- a/ports/libfreenect2/CONTROL +++ b/ports/libfreenect2/CONTROL @@ -1,5 +1,18 @@ Source: libfreenect2 -Version: 0.2.0-3 +Version: 0.2.0-4 Build-Depends: libusb, libjpeg-turbo Homepage: https://github.com/OpenKinect/libfreenect2 Description: Open source drivers for the Kinect for Windows v2 device +Default-Features: opengl + +Feature: opengl +Description: OpenGL support for libfreenect2 +Build-Depends: opengl, glfw3 + +Feature: opencl +Description: OpenCL support for libfreenect2 +Build-Depends: opencl + +Feature: cuda +Description: CUDA support for libfreenect2 +Build-Depends: cuda diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index 9ca8867fb3a24b..1642458e68baf0 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -18,11 +18,18 @@ string(REPLACE "(WIN32)" "(WIN32_DISABLE)" EXAMPLECMAKE "${EXAMPLECMAKE}") file(WRITE ${SOURCE_PATH}/examples/CMakeLists.txt "${EXAMPLECMAKE}") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + opengl ENABLE_OPENGL + opencl ENABLE_OPENCL + cuda ENABLE_CUDA +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DENABLE_CUDA=OFF + # FEATURES + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() From a2ee6dcf3527e2b1fe9407abec45440de1c5bd78 Mon Sep 17 00:00:00 2001 From: Wingkou Date: Sun, 5 Jan 2020 16:14:27 +0800 Subject: [PATCH 2/2] remove cuda feature --- ports/libfreenect2/CONTROL | 4 ---- ports/libfreenect2/portfile.cmake | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/libfreenect2/CONTROL b/ports/libfreenect2/CONTROL index cf4ea88183a8f8..b24480c83d768f 100644 --- a/ports/libfreenect2/CONTROL +++ b/ports/libfreenect2/CONTROL @@ -12,7 +12,3 @@ Build-Depends: opengl, glfw3 Feature: opencl Description: OpenCL support for libfreenect2 Build-Depends: opencl - -Feature: cuda -Description: CUDA support for libfreenect2 -Build-Depends: cuda diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index 1642458e68baf0..ff1ef220b37578 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -21,13 +21,13 @@ file(WRITE ${SOURCE_PATH}/examples/CMakeLists.txt "${EXAMPLECMAKE}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS opengl ENABLE_OPENGL opencl ENABLE_OPENCL - cuda ENABLE_CUDA ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DENABLE_CUDA=OFF # FEATURES ${FEATURE_OPTIONS} )