aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-09-28 12:12:04 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-09-28 12:12:04 -0700
commit0ce48afe1c4c21b8ab7007f5504bfae80f4ad1dc (patch)
tree7c97c95598efe0c9901325405d6c2ae2525160b5
parentcc29d43f8577be1e053572c83958e633fbbea4e5 (diff)
downloadvcpkg-0ce48afe1c4c21b8ab7007f5504bfae80f4ad1dc.tar.gz
vcpkg-0ce48afe1c4c21b8ab7007f5504bfae80f4ad1dc.zip
[opencv] Fix URL->URLS, -DWITH_CUDA=OFF, and LICENSE location
-rw-r--r--ports/opencv/portfile.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index bd19e8369..ad6bd2a53 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -1,6 +1,6 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
- URL "https://github.com/opencv/opencv/archive/92387b1ef8fad15196dd5f7fb4931444a68bc93a.zip"
+ URLS "https://github.com/opencv/opencv/archive/92387b1ef8fad15196dd5f7fb4931444a68bc93a.zip"
FILENAME "opencv-92387b1ef8fad15196dd5f7fb4931444a68bc93a.zip"
SHA512 b95fa1a5bce0ea9e9bd43173b904e5d779a2f640f4f8dbb36a12df462e8e4cdce3ff94b2fbd85cb96ddf338019f9888e9e7410c468c81b1de98d9c1da945a7eb
)
@@ -32,6 +32,7 @@ vcpkg_configure_cmake(
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv
-DOPENCV_OTHER_INSTALL_PATH=share/opencv
-DINSTALL_LICENSE=OFF
+ -DWITH_CUDA=OFF
OPTIONS_DEBUG
-DINSTALL_HEADERS=OFF
-DINSTALL_OTHER=OFF
@@ -46,6 +47,6 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake "${OPE
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/opencv/LICENSE ${CURRENT_PACKAGES_DIR}/share/opencv/copyright)
vcpkg_copy_pdbs()