diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 70b6e5e764c..daaa9b0dba3 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -18,7 +18,7 @@ jobs: ubuntu-makefile: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update apt run: sudo apt update @@ -74,7 +74,7 @@ jobs: ubuntu-vcpkg-opencv4-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 @@ -125,19 +125,19 @@ jobs: LD_LIBRARY_PATH: "/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:$LD_LIBRARY_PATH" run: ${{ github.workspace }}/build.ps1 -UseVCPKG -DoNotUpdateVCPKG -EnableOPENCV -EnableCUDA -EnableCUDNN -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-cuda-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-cuda-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-cuda-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-cuda-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -146,7 +146,7 @@ jobs: ubuntu-vcpkg-opencv3-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -197,7 +197,7 @@ jobs: ubuntu-vcpkg-opencv2-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -248,7 +248,7 @@ jobs: ubuntu: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update apt run: sudo apt update @@ -266,19 +266,19 @@ jobs: LD_LIBRARY_PATH: "/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:$LD_LIBRARY_PATH" run: ${{ github.workspace }}/build.ps1 -EnableOPENCV -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -287,7 +287,7 @@ jobs: ubuntu-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update apt run: sudo apt update @@ -315,19 +315,19 @@ jobs: LD_LIBRARY_PATH: "/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:$LD_LIBRARY_PATH" run: ${{ github.workspace }}/build.ps1 -EnableOPENCV -EnableCUDA -EnableCUDNN -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-cuda-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-cuda-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-cuda-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-cuda-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -336,7 +336,7 @@ jobs: ubuntu-no-ocv-cpp: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -348,7 +348,7 @@ jobs: ubuntu-setup-sh: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Setup vcpkg and NuGet artifacts backend' shell: bash @@ -377,7 +377,7 @@ jobs: osx-vcpkg: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 @@ -411,19 +411,19 @@ jobs: shell: pwsh run: ${{ github.workspace }}/build.ps1 -UseVCPKG -DoNotUpdateVCPKG -EnableOPENCV -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -432,7 +432,7 @@ jobs: osx: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: brew install opencv libomp @@ -443,19 +443,19 @@ jobs: shell: pwsh run: ${{ github.workspace }}/build.ps1 -EnableOPENCV -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -464,7 +464,7 @@ jobs: osx-no-ocv-no-omp-cpp: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -476,7 +476,7 @@ jobs: win-vcpkg: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 @@ -507,23 +507,23 @@ jobs: shell: pwsh run: ${{ github.workspace }}/build.ps1 -UseVCPKG -ForceLocalVCPKG -DoNotUpdateVCPKG -EnableOPENCV -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/build_release/*.dll - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -532,7 +532,7 @@ jobs: win-vcpkg-port: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Setup vcpkg and NuGet artifacts backend' shell: bash @@ -561,7 +561,7 @@ jobs: win-intlibs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -569,23 +569,23 @@ jobs: shell: pwsh run: ${{ github.workspace }}/build.ps1 -DisableInteractive -DoNotUpdateTOOL - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: cfg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: data - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/*dark* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/3rdparty/pthreads/bin/*.dll - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: darknet-${{ runner.os }} path: ${{ github.workspace }}/uselib* @@ -594,7 +594,7 @@ jobs: win-setup-ps1: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Setup vcpkg and NuGet artifacts backend' shell: bash @@ -623,7 +623,7 @@ jobs: win-intlibs-cpp: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -635,7 +635,7 @@ jobs: win-csharp: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -647,7 +647,7 @@ jobs: win-intlibs-cuda: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Install CUDA' run: ${{ github.workspace }}/scripts/deploy-cuda.ps1 @@ -665,7 +665,7 @@ jobs: win-powershell51: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -677,17 +677,13 @@ jobs: mingw: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest - name: 'Build with CMake' - uses: lukka/run-cmake@v3 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - useVcpkgToolchainFile: true - buildDirectory: '${{ runner.workspace }}/buildDirectory' - cmakeAppendedArgs: "-G\"MinGW Makefiles\" -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=OFF -DENABLE_CUDNN=OFF -DENABLE_OPENCV=OFF" - cmakeBuildType: 'Release' - buildWithCMakeArgs: '--config Release --target install' + run: | + mkdir build_release + cd build_release + cmake .. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=OFF -DENABLE_CUDNN=OFF -DENABLE_OPENCV=OFF + cmake --build . --config Release --target install diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index d7c3447824f..c97875046fe 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -9,7 +9,7 @@ jobs: ubuntu-makefile: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update apt run: sudo apt update @@ -65,7 +65,7 @@ jobs: ubuntu-vcpkg-opencv4-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -106,7 +106,7 @@ jobs: ubuntu-vcpkg-opencv3-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -147,7 +147,7 @@ jobs: ubuntu-vcpkg-opencv2-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -188,7 +188,7 @@ jobs: ubuntu: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update apt run: sudo apt update @@ -210,7 +210,7 @@ jobs: ubuntu-cuda: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update apt run: sudo apt update @@ -242,7 +242,7 @@ jobs: ubuntu-no-ocv-cpp: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -254,7 +254,7 @@ jobs: ubuntu-setup-sh: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Setup vcpkg and NuGet artifacts backend' shell: bash @@ -273,7 +273,7 @@ jobs: osx-vcpkg: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: brew install libomp yasm nasm pkg-config @@ -297,7 +297,7 @@ jobs: osx: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: brew install opencv libomp @@ -312,7 +312,7 @@ jobs: osx-no-ocv-no-omp-cpp: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -324,7 +324,7 @@ jobs: win-vcpkg: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -345,7 +345,7 @@ jobs: win-intlibs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -357,7 +357,7 @@ jobs: win-setup-ps1: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Setup vcpkg and NuGet artifacts backend' shell: bash @@ -376,7 +376,7 @@ jobs: win-intlibs-cpp: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -388,7 +388,7 @@ jobs: win-csharp: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -400,7 +400,7 @@ jobs: win-intlibs-cuda: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Install CUDA' run: ${{ github.workspace }}/scripts/deploy-cuda.ps1 @@ -418,7 +418,7 @@ jobs: win-powershell51: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest @@ -430,17 +430,13 @@ jobs: mingw: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: lukka/get-cmake@latest - name: 'Build with CMake' - uses: lukka/run-cmake@v3 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - useVcpkgToolchainFile: true - buildDirectory: '${{ runner.workspace }}/buildDirectory' - cmakeAppendedArgs: "-G\"MinGW Makefiles\" -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=OFF -DENABLE_CUDNN=OFF -DENABLE_OPENCV=OFF" - cmakeBuildType: 'Release' - buildWithCMakeArgs: '--config Release --target install' + run: | + mkdir build_release + cd build_release + cmake .. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=OFF -DENABLE_CUDNN=OFF -DENABLE_OPENCV=OFF + cmake --build . --config Release --target install diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 251a259ffcf..f9e853e439b 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -5,15 +5,22 @@ on: jobs: rebase: name: Rebase - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'CONTRIBUTOR') runs-on: ubuntu-latest + if: >- + github.event.issue.pull_request != '' && + ( + contains(github.event.comment.body, '/rebase') || + contains(github.event.comment.body, '/autosquash') + ) steps: - name: Checkout the latest code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} fetch-depth: 0 # otherwise, you will fail to push refs to dest repo - name: Automatic Rebase - uses: cirrus-actions/rebase@1.5 + uses: cirrus-actions/rebase@1.8 + with: + autosquash: ${{ contains(github.event.comment.body, '/autosquash') || contains(github.event.comment.body, '/rebase-autosquash') }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index d3afb968447..412a93f9e1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,6 @@ -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.19) include(CMakeDependentOption) -set(Darknet_MAJOR_VERSION 0) -set(Darknet_MINOR_VERSION 2) -set(Darknet_PATCH_VERSION 5) -set(Darknet_TWEAK_VERSION 4) -set(Darknet_VERSION ${Darknet_MAJOR_VERSION}.${Darknet_MINOR_VERSION}.${Darknet_PATCH_VERSION}.${Darknet_TWEAK_VERSION}) - -message("Darknet_VERSION: ${Darknet_VERSION}") - option(CMAKE_VERBOSE_MAKEFILE "Create verbose makefile" ON) option(CUDA_VERBOSE_BUILD "Create verbose CUDA build" ON) option(BUILD_SHARED_LIBS "Create dark as a shared library" ON) @@ -85,17 +77,23 @@ endif() cmake_dependent_option(ENABLE_SSE_AND_AVX_FLAGS "Enable AVX and SSE optimizations (x86-only)" ON "CMAKE_COMPILER_IS_GNUCC_OR_CLANG;IS_X86" OFF) if(ENABLE_VCPKG_INTEGRATION AND DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) + set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) + set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON) set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") #set(_VCPKG_INSTALLED_DIR ${CMAKE_CURRENT_LIST_DIR}/vcpkg CACHE STRING "") #folder for manifest-installed dependencies message(STATUS "VCPKG found: $ENV{VCPKG_ROOT}") message(STATUS "Using VCPKG integration") - message(STATUS "VCPKG_MANIFEST_FEATURES: ${VCPKG_MANIFEST_FEATURES}") set(USE_INTEGRATED_LIBS "FALSE" CACHE BOOL "Use libs distributed with this repo") + if(VCPKG_MANIFEST_FEATURES) + message(STATUS "VCPKG_MANIFEST_FEATURES: ${VCPKG_MANIFEST_FEATURES}") + endif() elseif(DEFINED CMAKE_TOOLCHAIN_FILE) message(STATUS "Using toolchain: ${CMAKE_TOOLCHAIN_FILE}") if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg.cmake") message(STATUS "Toolchain uses VCPKG integration") - message(STATUS "VCPKG_MANIFEST_FEATURES: ${VCPKG_MANIFEST_FEATURES}") + if(VCPKG_MANIFEST_FEATURES) + message(STATUS "VCPKG_MANIFEST_FEATURES: ${VCPKG_MANIFEST_FEATURES}") + endif() endif() set(USE_INTEGRATED_LIBS "FALSE" CACHE BOOL "Use libs distributed with this repo") elseif(WIN32) @@ -106,6 +104,30 @@ else() set(USE_INTEGRATED_LIBS "TRUE" CACHE BOOL "Use libs distributed with this repo") endif() +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json) + file(READ ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json VCPKG_JSON_STRING) + string(JSON VERSION_STRING GET ${VCPKG_JSON_STRING} version) +else() + set(VERSION_STRING "0.2.5.4") +endif() + +string(REPLACE "." ";" VERSION_LIST ${VERSION_STRING}) +list(LENGTH VERSION_LIST VERSION_LIST_LENGTH) +if(VERSION_LIST_LENGTH LESS 3) + message(FATAL_ERROR "Darknet needs at least major.minor.patch version numbers to properly configure") +endif() +list(GET VERSION_LIST 0 Darknet_MAJOR_VERSION) +list(GET VERSION_LIST 1 Darknet_MINOR_VERSION) +list(GET VERSION_LIST 2 Darknet_PATCH_VERSION) +if(VERSION_LIST_LENGTH GREATER 3) + list(GET VERSION_LIST 3 Darknet_TWEAK_VERSION) +else() + set(Darknet_TWEAK_VERSION 0) +endif() + +set(Darknet_VERSION ${Darknet_MAJOR_VERSION}.${Darknet_MINOR_VERSION}.${Darknet_PATCH_VERSION}.${Darknet_TWEAK_VERSION}) +message("Darknet_VERSION: ${Darknet_VERSION}") + project(Darknet VERSION ${Darknet_VERSION}) enable_language(C) @@ -602,3 +624,11 @@ endif() if(ENABLE_CSHARP_WRAPPER) add_subdirectory(src/csharp) endif() + +set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) +include(InstallRequiredSystemLibraries) + +install( + PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} + DESTINATION ${INSTALL_BIN_DIR} +) diff --git a/vcpkg.json b/vcpkg.json index 30caffb7f88..045049cca21 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "darknet", - "version-date": "2021-04-16", + "version": "0.2.5.5", "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/vcpkg.json.opencv23 b/vcpkg.json.opencv23 index ccfb9afa289..11c1a5da21e 100644 --- a/vcpkg.json.opencv23 +++ b/vcpkg.json.opencv23 @@ -1,6 +1,6 @@ { "name": "darknet", - "version-date": "2021-04-16", + "version": "0.2.5.5", "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": [