Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update package defaults to reflect needs for kwiver-v2 #758

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update package defaults to reflect needs for kwiver-v2 #758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ set(ffnvcodec_url "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git")
# FFmpeg
if (fletch_ENABLE_FFmpeg OR fletch_ENABLE_ALL_PACKAGES)
# allow different versions to be selected for testing purposes
set(FFmpeg_SELECT_VERSION 3.3.3 CACHE STRING "Select the version of FFmpeg to build.")
set(FFmpeg_SELECT_VERSION 5.1.2 CACHE STRING "Select the version of FFmpeg to build.")
set_property(CACHE FFmpeg_SELECT_VERSION PROPERTY STRINGS "2.6.2" "3.3.3" "4.4.1" "5.1.2")
mark_as_advanced(FFmpeg_SELECT_VERSION)

Expand Down Expand Up @@ -307,7 +307,7 @@ list(APPEND fletch_external_sources Qt)
# OpenCV
# Support 3.4, 4.2, 4.5.1, 4.9 optionally
if (fletch_ENABLE_OpenCV OR fletch_ENABLE_ALL_PACKAGES OR AUTO_ENABLE_CAFFE_DEPENDENCY)
set(OpenCV_SELECT_VERSION 3.4.0 CACHE STRING "Select the version of OpenCV to build.")
set(OpenCV_SELECT_VERSION 4.9.0 CACHE STRING "Select the version of OpenCV to build.")
set_property(CACHE OpenCV_SELECT_VERSION PROPERTY STRINGS "3.4.0" "4.2.0" "4.5.1" "4.9.0")

set(OpenCV_version ${OpenCV_SELECT_VERSION})
Expand Down Expand Up @@ -575,7 +575,7 @@ list(APPEND fletch_external_sources Darknet)

# pybind11
if (fletch_ENABLE_pybind11 OR fletch_ENABLE_ALL_PACKAGES)
set(pybind11_SELECT_VERSION 2.5.0 CACHE STRING "Select the version of pybind11 to build.")
set(pybind11_SELECT_VERSION 2.10.3 CACHE STRING "Select the version of pybind11 to build.")
set_property(CACHE pybind11_SELECT_VERSION PROPERTY STRINGS "2.5.0" "2.10.3")
endif()

Expand Down