mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

[cudnn] remove hardcoded version in cmake module (#3738)

Browse Source 
collateral fixes: 
* handle opencv4 upgrade on vcpkg
* add yasm (ffmpeg prerequisite) on travis
* install ffmpeg separately from opencv to circumvent time limits
* build only release to halve ci time
* do not build as shared libs when using vcpkg, since default triplets are static
* remove debug configs from appveyor matrix
This commit is contained in:
Stefano Sinigardi
2019-08-24 13:46:45 +02:00
committed by GitHub
parent 4c315ea26b
commit 35346d2ef8
4 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -16,12 +16,14 @@ then
vcpkg_define="-DCMAKE_TOOLCHAIN_FILE=${vcpkg_path}/scripts/buildsystems/vcpkg.cmake"
vcpkg_triplet_define="-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet"
echo "Found vcpkg in VCPKG_ROOT: ${vcpkg_path}"
additional_defines="-DBUILD_SHARED_LIBS=OFF"
elif [[ ! -z "${WORKSPACE}" ]] && [ -d ${WORKSPACE}/vcpkg ] && [ ! "$bypass_vcpkg" = true ]
then
vcpkg_path="${WORKSPACE}/vcpkg"
vcpkg_define="-DCMAKE_TOOLCHAIN_FILE=${vcpkg_path}/scripts/buildsystems/vcpkg.cmake"
vcpkg_triplet_define="-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet"
echo "Found vcpkg in WORKSPACE/vcpkg: ${vcpkg_path}"
additional_defines="-DBUILD_SHARED_LIBS=OFF"
elif [ ! "$bypass_vcpkg" = true ]
then
(>&2 echo "darknet is unsupported without vcpkg, use at your own risk!")