diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-03-04 10:51:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 10:51:49 -0800 |
| commit | 215798a356c3a7d42febbb83954b3ac6a2328515 (patch) | |
| tree | f53aa868d2b9332a922d339a257f085749f81f43 | |
| parent | 24cc91c933d332749d1d434e078f8d5daae96154 (diff) | |
| download | vcpkg-215798a356c3a7d42febbb83954b3ac6a2328515.tar.gz vcpkg-215798a356c3a7d42febbb83954b3ac6a2328515.zip | |
[darknet] update to latest release (#10280)
* [darknet] update to latest release
* [darknet] add corrections from review
| -rw-r--r-- | ports/darknet/CONTROL | 3 | ||||
| -rw-r--r-- | ports/darknet/portfile.cmake | 36 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
3 files changed, 11 insertions, 30 deletions
diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL index 66bcbb76b..b68d214c8 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,8 +1,7 @@ Source: darknet -Version: 0.2.5.1-1 +Version: 2020-03-02 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 -Supports: !(arm|uwp) Feature: cuda Build-Depends: cuda diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index efbf26cde..51cb9f376 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,18 +1,8 @@ -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - message(FATAL_ERROR "darknet does not support ARM") -endif() - -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "darknet does not support UWP") -endif() - -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF 35346d2ef80dc46b9eb4fba57da1737a49f4743e - SHA512 a905a5e42c4ecfdf2b8276fc565b82e30c97e249c0530b403d149a8e6276bb3852a956869c21efbe092799f3743cf529a577fb03275cfcfcc8322b92e9de0ff6 + REF 81290b07376c5abb4988a492dda70913bb90133d + SHA512 094197cde851dfdd1e102a3ffaed34d67a789dd75dc288bde611144dc9aa484ca0b9e3468abc297d075d3753553f7f09a214be279af9e58ccb642aa757909f79 HEAD_REF master ) @@ -110,22 +100,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(CMAKE_HOST_WIN32) - set(EXECUTABLE_SUFFIX ".exe") -else() - set(EXECUTABLE_SUFFIX "") -endif() - -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/darknet${EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib${EXECUTABLE_SUFFIX}) -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${EXECUTABLE_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/darknet${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) endif() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/darknet${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/darknet${EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib${EXECUTABLE_SUFFIX}) -if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/uselib_track${EXECUTABLE_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib_track${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib_track${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/darknet${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/darknet${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) endif() file(COPY ${SOURCE_PATH}/cfg DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0c5ee00af..7eeaafc6c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -314,8 +314,6 @@ cudnn:x64-uwp=fail cudnn:x64-windows-static=fail
cudnn:x86-windows=fail
cutelyst2:x64-osx=fail
-darknet:arm-uwp=fail
-darknet:x64-uwp=fail
date:arm64-windows=fail
dbow2:x64-osx=fail
dcmtk:arm64-windows=fail
|