DGtalTools icon indicating copy to clipboard operation
DGtalTools copied to clipboard

Main2.0

Open BDoignies opened this issue 10 months ago • 7 comments

Thanks a lot for contributing to DGtalTools, before submitting your PR, please fill up the description and make sure that all checkboxes are checked.

PR Description

The goal of this PR is to match changes in the branch DGTal/main2.0 (and corresponding) PRs.

Checklist

  • [ ] Doxygen documentation of the code completed (classes, methods, types, members...).
  • [ ] Main tool doxygen documentation (following existing documentation of DGtalTools documentation.
  • [ ] Check if it follows the tools structure described in CONTRIBUTING.md
  • [ ] New entry in the ChangeLog.md added.
  • [ ] Update the readme with potentially a screenshot of the tools if it applies.
  • [ ] No warning raised in Debug cmake mode (otherwise, Github Actions C.I. will fail).
  • [ ] All continuous integration tests pass (Github Actions).

BDoignies avatar Feb 12 '25 09:02 BDoignies

Thanks @BDoignies, I think you miss the PR #466 but we can keep this one..

kerautret avatar Feb 14 '25 12:02 kerautret

Oh sorry... my bad... Haven't seen yours...

Either is fine as long as we modify accordingly the corresponding worflow file in DGtal CMake2.0 PR.

BDoignies avatar Feb 14 '25 12:02 BDoignies

no problem ;) I also miss to mention you, not a big deal. There is perhaps also the contribution if you have to look (more light I think)

kerautret avatar Feb 14 '25 12:02 kerautret

We should run a diff on the two PR; or directly merge them together and fix conflicts if any. After a quick look, yours look a bit more complete in the variable it modifies; but I might be missing something.

BDoignies avatar Feb 14 '25 13:02 BDoignies

We should run a diff on the two PR; or directly merge them together and fix conflicts if any. After a quick look, yours look a bit more complete in the variable it modifies; but I might be missing something.

Or perhaps you can cherry-pick if you see some that you miss ;) btw the let me know if you plane to looks the related DGtalTools-contrib repository .

kerautret avatar Feb 14 '25 16:02 kerautret

Hey @kerautret,

I updated my PR to also modify variable WITH_VISU3D_QGLVIEWER, which was the only one missing if I am not mistaken.

I do not plan to look at DGtalTools-contrib for now. My primary focus is updating DGtal. DGtalTools was modified to make sure the GH-action run on DGtal side. There will be further updates in order to also make sure DGtalTools action also run.

Upon realease of DGtal 2.0, I will make sure, that the tools the community built are up-to-date with DGtal. If you wan't to start a PR for this, please do not forget to mention me :)

BDoignies avatar Feb 17 '25 09:02 BDoignies

Perfect thanks a lot @BDoignies fine for me, I can do it no problem. I will mention you sure ;)

kerautret avatar Feb 17 '25 10:02 kerautret

Big thanks @BDoignies and sorry for the delay interaction, just by testing with the V2 all looks fine with DGtal and polyscope tools viewer (very huge work 👏), however I just have an error with cmake :

CMake Error at /opt/homebrew/share/cmake/Modules/CMakeFindDependencyMacro.cmake:76 (find_package): By not providing "Findglfw.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "glfw", but CMake did not find one.

Could not find a package configuration file provided by "glfw" with any of the following names:

glfwConfig.cmake
glfw-config.cmake

Add the installation prefix of "glfw" to CMAKE_PREFIX_PATH or set "glfw_DIR" to a directory containing one of the above files. If "glfw" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): /Users/kerautre/EnCours/DGtal/buildV2/DGtalConfig.cmake:70 (find_dependency) CMakeLists.txt:41 (FIND_PACKAGE)

kerautret avatar Jul 07 '25 12:07 kerautret

it is probably coming from polyscope inclusion but from DGtal example all is working perfectly

kerautret avatar Jul 07 '25 12:07 kerautret

Maybe not directly. The DGtalConfig.cmake.in file redoes the polyscope inclusions “by hand”. Maybe there's a conflict between what's found by polyscope and what's found by CMake... I'll investigate as soon as I can.

BDoignies avatar Jul 07 '25 12:07 BDoignies

Maybe not directly. The DGtalConfig.cmake.in file redoes the polyscope inclusions “by hand”. Maybe there's a conflict between what's found by polyscope and what's found by CMake... I'll investigate as soon as I can.

Thanks, I try to have a look also

kerautret avatar Jul 07 '25 13:07 kerautret

@BDoignies it looks like that adding: list(APPEND CMAKE_PREFIX_PATH "${DGtal_DIR}") in CMakeList of DGtalTools fix the issue. I look with other fix related to CLI11 et CPP20

kerautret avatar Jul 07 '25 21:07 kerautret

@dcoeurjo @BDoignies I propose to merge this one, then I have a #468 that fix compilation issue from polyscope cmake and new CLI11 version

kerautret avatar Jul 08 '25 13:07 kerautret