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

[opencv3] no absolute paths #28179

Merged
merged 1 commit into from
Dec 8, 2022
Merged

[opencv3] no absolute paths #28179

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ports/opencv3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,6 @@ endif()

vcpkg_fixup_pkgconfig()

configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage")
configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
4 changes: 2 additions & 2 deletions ports/opencv3/usage.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The package ${PORT} is compatible with CMake if you set the OpenCV_DIR *before* the find_package call
The package @PORT@ is compatible with CMake if you set the OpenCV_DIR *before* the find_package call

set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}")
set(OpenCV_DIR "${VCPKG_INSTALLED_DIR}/@TARGET_TRIPLET@/share/@PORT@")
find_package(OpenCV REQUIRED)
2 changes: 1 addition & 1 deletion ports/opencv3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.18",
"port-version": 4,
"port-version": 5,
"description": "Open Source Computer Vision Library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5478,7 +5478,7 @@
},
"opencv3": {
"baseline": "3.4.18",
"port-version": 4
"port-version": 5
},
"opencv4": {
"baseline": "4.6.0",
Expand Down Expand Up @@ -7228,7 +7228,7 @@
"baseline": "0.9.3",
"port-version": 0
},
"sse2neon" : {
"sse2neon": {
"baseline": "1.5.1",
"port-version": 0
},
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "876eb437a419de1c4b052aa706aff9c4fea5210c",
"version": "3.4.18",
"port-version": 5
},
{
"git-tree": "9ba33f70606fe9df685c72eae8884204f582d9af",
"version": "3.4.18",
Expand Down