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

Jump to bottom

[OpenCV] fix compatibility with VTK9 #12785

Merged
merged 28 commits into from
Dec 11, 2020
Merged

[OpenCV] fix compatibility with VTK9 #12785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d8b8f19
[OpenCV] fix compatibility with VTK9
cenit Aug 6, 2020
5508555
fix patch filename
cenit Aug 6, 2020
03aefcc
[OpenCV3/4] improve VTK9 compatibillity
cenit Aug 7, 2020
0e62ace
[OpenCV4] viz module in opencv4 explicitly requires contrib
cenit Aug 7, 2020
e35521d
[vtk] fix its usage in downstream projects - was failing before
cenit Aug 10, 2020
08b3531
[OpenCV3] enable VTK on static builds
cenit Aug 10, 2020
f781746
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Aug 27, 2020
aff271c
[opencv] add an almost fully-featured test port for OpenCV/CI
cenit Aug 27, 2020
c8ffe5c
[vtk] trying out upstream patch
cenit Sep 1, 2020
fb29e83
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Sep 1, 2020
6c86454
fix patch EOL
cenit Sep 1, 2020
ba8aec7
fix regressions
cenit Sep 3, 2020
60cfe59
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Sep 4, 2020
ce76ef7
remove broken fix
cenit Sep 4, 2020
855709f
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Sep 7, 2020
e8d8077
uniform opencv3/4 downstream usage
cenit Sep 16, 2020
41b0f07
expand tracing
cenit Sep 17, 2020
4bf432a
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Oct 14, 2020
4606bf6
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Oct 29, 2020
7847ee6
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Nov 9, 2020
b070401
Merge branch 'master' into dev/cenit/opencv_vtk9
cenit Dec 8, 2020
56601d1
merge with master
cenit Dec 8, 2020
5c6dbde
revert ffmpeg added features
cenit Dec 8, 2020
d6db828
[tesseract] add missing dependency on libarchive
cenit Dec 9, 2020
6f33596
[tesseract] add missing find_packages call for dependencies
cenit Dec 10, 2020
d66679f
[ceres] fix C++14 standard required for ports using classic target
cenit Dec 10, 2020
849341a
merge with master
cenit Dec 10, 2020
6f541c3
[opencv] fix vtk dependency for downstream projects
cenit Dec 10, 2020
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: 6 additions & 0 deletions ports/ceres/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ if(VCPKG_TARGET_IS_WINDOWS)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib${LIB_SUFFIX}/cmake/Ceres)
endif()
file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_CONFIG)
string(REPLACE "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres)"
"set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)" CERES_CONFIG "${CERES_CONFIG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_CONFIG}")

vcpkg_copy_pdbs()

Expand Down
2 changes: 1 addition & 1 deletion ports/ceres/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ceres",
"version-string": "2.0.0",
"port-version": 1,
"port-version": 2,
"description": "non-linear optimization package",
"homepage": "https://github.com/ceres-solver/ceres-solver",
"dependencies": [
Expand Down
6 changes: 1 addition & 5 deletions ports/opencv2/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: opencv2
Version: 2.4.13.7
Port-Version: 3
Port-Version: 4
Build-Depends: zlib
Description: computer vision library, version 2
Default-Features: eigen, jpeg, opengl, png, tiff
Expand Down Expand Up @@ -45,9 +45,5 @@ Feature: tiff
Build-Depends: tiff
Description: TIFF support for opencv

Feature: vtk
Build-Depends: vtk
Description: vtk support for opencv
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved

Feature: world
Description: Compile to a single package support for opencv
12 changes: 0 additions & 12 deletions ports/opencv2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"world" BUILD_opencv_world
)

set(WITH_VTK OFF)
if("vtk" IN_LIST FEATURES)
set(WITH_VTK ON)
endif()

set(WITH_MSMF ON)
if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
set(WITH_MSMF OFF)
endif()

if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
if (WITH_VTK)
message(WARNING "VTK is currently unsupported in this build configuration, turning it off")
set(WITH_VTK OFF)
endif()
endif()

if("ffmpeg" IN_LIST FEATURES)
if(VCPKG_TARGET_IS_UWP)
set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}")
Expand Down
Loading