Skip to content

Enable to compile to a single opencv_world library file #3914

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

Merged
cbezault merged 3 commits into from
May 21, 2019
Merged

Enable to compile to a single opencv_world library file #3914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56a84e9
Enable to compile to a single opencv_world library file
chuong-csiro Jul 16, 2018
0d96d87
Merge branch 'master' into world-feature
cbezault May 21, 2019
85b41a6
Remove world from the default features
cbezault May 21, 2019
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
3 changes: 3 additions & 0 deletions ports/opencv/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,8 @@ Feature: eigen
Build-Depends: eigen3
Description: Eigen support for opencv

Feature: world
Description: Compile to a single package support for opencv

Feature: nonfree
Description: allow nonfree and unredistributable libraries
6 changes: 6 additions & 0 deletions ports/opencv/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)

set(CMAKE_MODULE_PATH)

set(BUILD_opencv_world OFF)
if("world" IN_LIST FEATURES)
set(BUILD_opencv_world ON)
endif()

set(BUILD_opencv_dnn OFF)
set(WITH_PROTOBUF OFF)
if("dnn" IN_LIST FEATURES)
Expand Down Expand Up @@ -274,6 +279,7 @@ vcpkg_configure_cmake(
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_saliency=${BUILD_opencv_saliency}
-DBUILD_opencv_sfm=${BUILD_opencv_sfm}
-DBUILD_opencv_world=${BUILD_opencv_world}
# PROTOBUF
-DPROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES}
-DUPDATE_PROTO_FILES=${UPDATE_PROTO_FILES}
Expand Down