Skip to content

[cgal] update to 5.5.2#30341

Merged
vicroms merged 7 commits intomicrosoft:masterfrom
lrineau:cgal-5.5.2
Apr 4, 2023
Merged

[cgal] update to 5.5.2#30341
vicroms merged 7 commits intomicrosoft:masterfrom
lrineau:cgal-5.5.2

Conversation

@lrineau
Copy link
Copy Markdown
Contributor

@lrineau lrineau commented Mar 21, 2023 •
edited
Loading

  • Changes comply with the maintainer guide
  • The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
  • Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all find_package calls are REQUIRED, are satisfied by vcpkg.json's declared dependencies, or disabled with CMAKE_DISABLE_FIND_PACKAGE_Xxx
  • The versioning scheme in vcpkg.json matches what upstream says.
  • The license declaration in vcpkg.json matches what upstream says.
  • The installed as the "copyright" file matches what upstream says.
  • The source code of the component installed comes from an authoritative source.
  • The generated "usage text" is accurate. See adding-usage for context.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is in the new port's versions file.
  • Only one version is added to each modified port's versions file.

@lrineau lrineau mentioned this pull request Mar 21, 2023
Closed
@MonicaLiu0311 MonicaLiu0311 added the category:port-update The issue is with a library, which is requesting update new revision label Mar 22, 2023
@lrineau lrineau mentioned this pull request Mar 23, 2023
Closed
@lrineau
Copy link
Copy Markdown
Contributor Author

lrineau commented Mar 23, 2023

It turns out my local computer runs x64_linux, and I can reproduce the CI build failure.

The issue in the build of colmap, and the culprit seems to be glog on Linux, being compiled in static, and not pulling installed/x64-linux/lib/libgflags.a as a dependency.

See the build logs at https://gist.github.com/lrineau/40ce6eecbca3ca52cfe8cb2bf16b72d9

Do you have an idea what I should do? Do I have to fix the colmap/glog/gflags issue in this PR, if I can?

@lrineau
Copy link
Copy Markdown
Contributor Author

lrineau commented Mar 27, 2023

Now the new issue is still with x64-linux, and still with colmap. In install-x64-linux-dbg-err.log:

ninja: error: '/mnt/vcpkg-ci/installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a', needed by 'src/exe/colmap', missing and no known rule to make it

The file installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a does not exists. but installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a does. The version in debug/lib/ is missing. Anyway, that does not seem to be an issue with colmap, because colmap does not depend on MKL, or BLAS, or LAPACK. But suitesparse does.

I wonder how intel-mkl got pull in the dependencies.

@lrineau
Copy link
Copy Markdown
Contributor Author

lrineau commented Mar 31, 2023

Now the new issue is still with x64-linux, and still with colmap. In install-x64-linux-dbg-err.log:

ninja: error: '/mnt/vcpkg-ci/installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a', needed by 'src/exe/colmap', missing and no known rule to make it

The file installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a does not exists. but installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a does. The version in debug/lib/ is missing. Anyway, that does not seem to be an issue with colmap, because colmap does not depend on MKL, or BLAS, or LAPACK. But suitesparse does.

I wonder how intel-mkl got pull in the dependencies.

Now I know. See the issue #30580. I do not have a fix though.

@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Mar 31, 2023

installed/x64-linux/debug/lib/intel64/libmkl_intel_lp64.a is strange indeed.

@lrineau lrineau marked this pull request as ready for review March 31, 2023 13:47
@lrineau lrineau mentioned this pull request Mar 31, 2023
Closed
@lrineau
Copy link
Copy Markdown
Contributor Author

lrineau commented Mar 31, 2023

@MonicaLiu0311 After the merge of master, the fix from PR #30421 got pulled and now colmap compiles. This PR checks are now eventually all green.

Should I rebase, or can this PR be merged as it is?

@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Mar 31, 2023

The easiest thing is to merge the latest master into your branch.

@lrineau
Copy link
Copy Markdown
Contributor Author

lrineau commented Mar 31, 2023

The easiest thing is to merge the latest master into your branch.

That is what I did with commit 8253c31 (after you pointed to #30421), and that fixed the CI issue for this PR.

@MonicaLiu0311
Copy link
Copy Markdown
Contributor

MonicaLiu0311 commented Apr 4, 2023

All features are tested successfully in the following triplet:

x86-windows
x64-windows
x64-windows-static

The usage test passed (header files found):

The package cgal provides CMake targets:

    find_package(CGAL CONFIG REQUIRED)
    target_link_libraries(main PRIVATE CGAL::CGAL)

@MonicaLiu0311 MonicaLiu0311 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Apr 4, 2023
@vicroms vicroms merged commit 470a5f6 into microsoft:master Apr 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@MonicaLiu0311 MonicaLiu0311 MonicaLiu0311 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@MonicaLiu0311 MonicaLiu0311

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lrineau @dg0yt @MonicaLiu0311 @vicroms