diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-06-10 00:51:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 15:51:27 -0700 |
| commit | 6b61943e178a6e861f3555a12cdc78e58a243763 (patch) | |
| tree | 5239c879d7fff8b1af628765f6a8086a95c40c88 | |
| parent | f7612e6e14b5bbdf680f97ea12f4ceb2368a2ebb (diff) | |
| download | vcpkg-6b61943e178a6e861f3555a12cdc78e58a243763.tar.gz vcpkg-6b61943e178a6e861f3555a12cdc78e58a243763.zip | |
[darknet] fix uselib_track tool installation (#18168)
* [darknet] fix uselib_track tool installation
* [darknet] update refs
| -rw-r--r-- | ports/darknet/portfile.cmake | 12 | ||||
| -rw-r--r-- | ports/darknet/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/d-/darknet.json | 5 |
4 files changed, 10 insertions, 10 deletions
diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index e3c876450..cd1f9716f 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF 91efb7c7f6c00a4616ed58735f7c670908d0a849 - SHA512 7f6187f8ccc89295daf7b15288bae0bf53638970422ced80a4a755e2b4765cda36f532ebc5c32a28804a2ed0ac6375e9a8f7449a9002e1b373378635a54f2c96 + REF 5853e51d604712918bd2fb23bab0ec82d19a88f9 + SHA512 d61e94209d66db3b71ad14d83c83a4d562879119b67881e9eacc60efb16e44496b291000c8c545055db5ae0e542cfb149fdbed2058584962fa52b604353ddccd HEAD_REF master ) @@ -14,14 +14,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS #do not move following features to vcpkg_check_features because they break themselves: one off will turn off the others even if true set(ENABLE_OPENCV FALSE) -set(ENABLE_OPENCV_WITH_CUDA FALSE) -if ("opencv-base" IN_LIST FEATURES OR "opencv2-base" IN_LIST FEATURES OR "opencv3-base" IN_LIST FEATURES) +if ("opencv-base" IN_LIST FEATURES OR "opencv2-base" IN_LIST FEATURES OR "opencv3-base" IN_LIST FEATURES OR "opencv-cuda" IN_LIST FEATURES OR "opencv2-cuda" IN_LIST FEATURES OR "opencv3-cuda" IN_LIST FEATURES) set(ENABLE_OPENCV TRUE) endif() -if ("opencv-cuda" IN_LIST FEATURES OR "opencv2-cuda" IN_LIST FEATURES OR "opencv3-cuda" IN_LIST FEATURES) - set(ENABLE_OPENCV TRUE) - set(ENABLE_OPENCV_WITH_CUDA TRUE) -endif() if ("cuda" IN_LIST FEATURES) if (NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT ENV{CUDACXX}) @@ -44,7 +39,6 @@ vcpkg_configure_cmake( -DINSTALL_BIN_DIR:STRING=bin -DINSTALL_LIB_DIR:STRING=lib -DENABLE_OPENCV:BOOL=${ENABLE_OPENCV} - -DENABLE_OPENCV_WITH_CUDA:BOOL=${ENABLE_OPENCV_WITH_CUDA} ) vcpkg_install_cmake() diff --git a/ports/darknet/vcpkg.json b/ports/darknet/vcpkg.json index 30caffb7f..d599397c6 100644 --- a/ports/darknet/vcpkg.json +++ b/ports/darknet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "darknet", "version-date": "2021-04-16", + "port-version": 1, "description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.", "homepage": "https://github.com/alexeyab/darknet", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5945d02db..97fcbf8c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1590,7 +1590,7 @@ }, "darknet": { "baseline": "2021-04-16", - "port-version": 0 + "port-version": 1 }, "darts-clone": { "baseline": "1767ab87cffe-1", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index a0c29f80e..7db7849e0 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "cb0cb4dcba244d4b82cdd65fa0c993cfd4691992", + "version-date": "2021-04-16", + "port-version": 1 + }, + { "git-tree": "b8aea30f123c47f5be294829fbfac4d9e8c1295d", "version-date": "2021-04-16", "port-version": 0 |