diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-05 17:45:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-05 17:45:10 -0800 |
| commit | 8d4d3087143b068b745746699407e67bfbae993e (patch) | |
| tree | b05b836ad681fdd86c50fba4b2674fb396f421f0 /ports/opencv/portfile.cmake | |
| parent | 8fde45999026e8291304747796cf945b248b63de (diff) | |
| download | vcpkg-8d4d3087143b068b745746699407e67bfbae993e.tar.gz vcpkg-8d4d3087143b068b745746699407e67bfbae993e.zip | |
[opencv] Fix UWP and ARM
Diffstat (limited to 'ports/opencv/portfile.cmake')
| -rw-r--r-- | ports/opencv/portfile.cmake | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index a91020f24..10bea9db2 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -68,6 +68,15 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(WITH_MSMF OFF) endif() +set(BUILD_opencv_line_descriptor ON) +set(BUILD_opencv_saliency ON) +set(BUILD_opencv_bgsegm ON) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + set(BUILD_opencv_line_descriptor OFF) + set(BUILD_opencv_saliency OFF) + set(BUILD_opencv_bgsegm OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -94,6 +103,9 @@ vcpkg_configure_cmake( -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_opencv_sfm=${BUILD_opencv_sfm} + -DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor} + -DBUILD_opencv_saliency=${BUILD_opencv_saliency} + -DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm} # CMAKE -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON # ENABLE @@ -137,6 +149,10 @@ else() endif() if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(OpenCV_ARCH x64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(OpenCV_ARCH ARM) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OpenCV_ARCH ARM64) else() set(OpenCV_ARCH x86) endif() |