Commit Graph

2 Commits

Author SHA1 Message Date
Tobias Kohlbau
a9aaead2d1 Merge branch 'master' of github.com:Microsoft/vcpkg into opencv_contrib 2017-03-28 10:51:53 +02:00
Tobias Kohlbau
4fbcf0df4d [opencv] adds opencv_contrib option
Adds the ability to enable opencv_contrib compilation. It is disabled by
default and needs to be enabled by the user (see comments for more
information). In future release it should be an user
selectable option as soon as vcpk supports this functionality.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2017-03-28 10:48:07 +02:00