diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2020-09-01 23:19:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 14:19:35 -0700 |
| commit | 8da2de2a053586c49fc26c21da8397eba8450857 (patch) | |
| tree | eb241a07182a53ae7d46c4d06496f94eb4d6f7e8 | |
| parent | d29602bf0bef96ce71941ab58ca00a33ea5457fb (diff) | |
| download | vcpkg-8da2de2a053586c49fc26c21da8397eba8450857.tar.gz vcpkg-8da2de2a053586c49fc26c21da8397eba8450857.zip | |
[darknet] update to v2020-08-30 (#13238)
| -rw-r--r-- | ports/darknet/CONTROL | 4 | ||||
| -rw-r--r-- | ports/darknet/fix_shared_static.patch | 20 | ||||
| -rw-r--r-- | ports/darknet/portfile.cmake | 6 |
3 files changed, 4 insertions, 26 deletions
diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL index ea0b5ce26..32e5b629f 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,7 +1,7 @@ Source: darknet -Version: 2020-06-29 +Version: 2020-08-30 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. -Build-Depends: pthreads (windows), stb +Build-Depends: pthreads, stb Feature: cuda Build-Depends: cuda diff --git a/ports/darknet/fix_shared_static.patch b/ports/darknet/fix_shared_static.patch deleted file mode 100644 index 5b9670f41..000000000 --- a/ports/darknet/fix_shared_static.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.12)
-+cmake_minimum_required(VERSION 3.17)
-
- set(Darknet_MAJOR_VERSION 0)
- set(Darknet_MINOR_VERSION 2)
-@@ -77,6 +77,11 @@ if(CMAKE_CUDA_COMPILER AND ENABLE_CUDA)
- else()
- message(STATUS "Your setup supports half precision (it requires CC >= 7.0)")
- endif()
-+ endif()
-+ if(BUILD_SHARED_LIBS)
-+ set(CMAKE_CUDA_RUNTIME_LIBRARY "Shared")
-+ else()
-+ set(CMAKE_CUDA_RUNTIME_LIBRARY "Static")
- endif()
- else()
- set(ENABLE_CUDA "FALSE" CACHE BOOL "Enable CUDA support" FORCE)
diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index ed8a41a72..b1ba7cf15 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF 320e6fd8d29f6f7825ef668f15f955f90131f782 - SHA512 f95ac04c1c4e1b3f28aa835a64d969ffee064a3681a7966b255981722d562aa1eb91c30a378cad2f1bccd4581b74d8c2ec641c57763bc0fa97bfce8b1c222480 + REF ecad770071eb776208a46977347e6d2410d4f50e + SHA512 1de0dc3f4842c68f5c12addf100996f7176ffb50dcd89a0b57446ba996d9199e31531f64c32eedbc2ea6a449459573811444dd35f1a50ece3880f58717c795ab HEAD_REF master - PATCHES - fix_shared_static.patch ) # enable CUDA inside DARKNET |