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.

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

[cgal][openmvs] CGAL: Upgrade to 5.0 #8659

Merged
merged 10 commits into from
Nov 22, 2019
Merged

Conversation

maxGimeno
Copy link
Contributor

Upgrade the CGAL port to version 5.0-beta1

@lrineau
Copy link
Contributor

lrineau commented Oct 18, 2019

This pull-request is for the moment a draft. Do not merge it until it is updated to 5.0 final version.

@lrineau
Copy link
Contributor

lrineau commented Oct 18, 2019

@maxGimeno

Could you add a usage file, like in the data port:

The package date provides CMake targets:
find_package(date CONFIG REQUIRED)
target_link_libraries(main PRIVATE date::date date::tz)

file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/date)

That would avoid the false message displayed automatically by vcpkg:

The package cgal:x64-linux provides CMake targets:

    find_package(CGAL CONFIG REQUIRED)

    # Note: 1 target(s) were omitted.

    target_link_libraries(main PRIVATE ${cgal_lib} CGAL::${cgal_lib} CGAL_Qt5_moc_and_resources CGAL::Qt5_moc_and_resources)

@lrineau
Copy link
Contributor

lrineau commented Oct 31, 2019

I have pushed an upgrade to CGAL-5.0-beta2. That is still a wip PR.

@maxGimeno
Copy link
Contributor Author

I have upgraded to 5.0. This PR should now be ready for integration.

@maxGimeno maxGimeno changed the title CGAL: Upgrade to 5.0-beta1 CGAL: Upgrade to 5.0 Nov 12, 2019
@JackBoosY JackBoosY removed the wip label Nov 12, 2019
@acgetchell
Copy link

This is a really important library for my project. I have tests for MacOS, Linux, and Windows if you want real-world examples to check: https://github.com/acgetchell/CDT-plusplus

@maxGimeno
Copy link
Contributor Author

I don't understand the CI failures. It says it is probably caused by the missing log files for comparison baseline, but I don't know how to fix this :/

@JackBoosY
Copy link
Contributor

@maxGimeno See #8949.

@grdowns grdowns self-assigned this Nov 18, 2019
@JackBoosY
Copy link
Contributor

/azp run

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR LGTM except that openmvs needs to have its control version incremented to include the new patch file.

@ras0219-msft ras0219-msft changed the title CGAL: Upgrade to 5.0 [cgal][openmvs] CGAL: Upgrade to 5.0 Nov 22, 2019
@JackBoosY
Copy link
Contributor

@maxGimeno Please modify VCPKG_PATH/ports/openmvs/CONTROL:
Version: 1.0-2
->
Version: 1.0-3

@JackBoosY
Copy link
Contributor

@ras0219-msft I thinks this PR is ready to merge now.

@ras0219-msft ras0219-msft merged commit b6a50cb into microsoft:master Nov 22, 2019
@ras0219-msft
Copy link
Contributor

Thanks for the PR!

@acgetchell
Copy link

Thank you, that was a smooth upgrade and the first simultaneous one for me on Windows, Linux, and macOS.

https://ci.appveyor.com/project/acgetchell/cdt-plusplus#L518

https://travis-ci.org/acgetchell/CDT-plusplus/jobs/615752586#L540

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants