Skip to content

Commit

Permalink
[opencv4] no absolute paths (#28203)
Browse files Browse the repository at this point in the history
  • Loading branch information
autoantwort committed Dec 7, 2022
1 parent b1b613b commit ec06445
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ports/opencv4/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ 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(GLOB extra_license_files "${CURRENT_PACKAGES_DIR}/share/licenses/opencv4/*")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" ${extra_license_files})
Expand Down
4 changes: 2 additions & 2 deletions ports/opencv4/usage.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
If you do not install the meta-port *opencv*, the package ${PORT} is compatible with CMake
If you do not install the meta-port *opencv*, 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/opencv4/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.6.0",
"port-version": 9,
"port-version": 10,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5482,7 +5482,7 @@
},
"opencv4": {
"baseline": "4.6.0",
"port-version": 9
"port-version": 10
},
"opendnp3": {
"baseline": "3.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv4.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4ddfc66a3d38c96fbe831242cdd1148d54cbca87",
"version": "4.6.0",
"port-version": 10
},
{
"git-tree": "3fcb51fbbc3605e41bcdbd0ea0acd6233127b49b",
"version": "4.6.0",
Expand Down

0 comments on commit ec06445

Please sign in to comment.