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

[pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build #31257

Merged
merged 7 commits into from
May 9, 2023
Merged

[pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build #31257

merged 7 commits into from
May 9, 2023

Conversation

cbrl
Copy link
Contributor

@cbrl cbrl commented May 4, 2023

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

This updates PDAL to version 2.5.3, and includes a PR that fixes a build error with GCC 13. The GCC 8 compatibility patch was removed as it has been accepted into the upstream repo.

PDAL 2.5.3 depends on Draco 1.5.6. An existing PR to upgrade Draco exists at #31220

@cbrl cbrl mentioned this pull request May 4, 2023
7 tasks
@jimwang118 jimwang118 added the category:port-update The issue is with a library, which is requesting update new revision label May 5, 2023
@MonicaLiu0311
Copy link
Contributor

The following error occurs during CI testing:

-- Configuring x64-windows
CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:112 (message):
    Command failed: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe" -v
    Working Directory: D:/buildtrees/pdal/x64-windows-rel/vcpkg-parallel-configure
    Error code: 1
    See logs for more information:
      D:\buildtrees\pdal\config-x64-windows-dbg-CMakeCache.txt.log
      D:\buildtrees\pdal\config-x64-windows-rel-CMakeCache.txt.log
      D:\buildtrees\pdal\config-x64-windows-out.log

Call Stack (most recent call first):
  D:/installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_configure.cmake:248 (vcpkg_execute_required_process)
  ports/pdal/portfile.cmake:49 (vcpkg_cmake_configure)
  scripts/ports.cmake:147 (include)

D:\buildtrees\pdal\config-x64-windows-out.log:

CMake Error at C:/a/1/s/scripts/buildsystems/vcpkg.cmake:852 (_find_package):
  Could not find a configuration file for package "Draco" that is compatible
  with requested version "1.5.6".

  The following configuration files were considered but not accepted:

    D:/installed/x64-windows/share/draco/draco-config.cmake, version: 1.5.3

Call Stack (most recent call first):
  plugins/draco/CMakeLists.txt:6 (find_package)

Note: I will be converting your PR to draft status. When you resolve, revert to "ready for review". That way, I know you've fixed it, since you can't modify the tags.

@MonicaLiu0311 MonicaLiu0311 marked this pull request as draft May 5, 2023 06:04
@cbrl
Copy link
Contributor Author

cbrl commented May 5, 2023

That error is expected until the mentioned PR for Draco is merged, which does unfortunately prevent the pipeline from running successfully. I will mark this for review once the Draco PR has been merged.

@cbrl cbrl changed the title [pdal] Update to v2.5.3 and fix GCC 13 build [pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build May 5, 2023
@cbrl
Copy link
Contributor Author

cbrl commented May 5, 2023

PDAL's C API must also be updated to version 2.2.0 to account for an API change in PDAL. I have added the required update to pdal-c to this PR.

@cbrl cbrl marked this pull request as ready for review May 5, 2023 18:38
@MonicaLiu0311
Copy link
Contributor

Usage:

The package pdal provides CMake variables:

    find_package(PDAL CONFIG REQUIRED)
    target_include_directories(${PDAL_INCLUDE_DIRS})
    target_link_libraries(main PRIVATE ${PDAL_LIBRARIES})

If necessary, override the default plugin search path by setting the
environment variable PDAL_DRIVER_PATH to a list of directories that
pdal should search for plugins.

When testing usage, the following error occurs:

1> [CMake] CMake Error at CMakeFindUsage/CMakeLists.txt:16 (target_include_directories):
1> [CMake]   target_include_directories called with incorrect number of arguments
1> [CMake] 
1> [CMake] 
1> [CMake] -- Configuring incomplete, errors occurred!

Added Usage from #21275, now submit 77fc184 to fix it.

@MonicaLiu0311
Copy link
Contributor

All features are tested successfully in the following triplet:

x86-windows
x64-windows

The usage test passed (header files found):

The package pdal provides CMake variables:

    find_package(PDAL CONFIG REQUIRED)
    target_include_directories(main PRIVATE ${PDAL_INCLUDE_DIRS})
    target_link_libraries(main PRIVATE ${PDAL_LIBRARIES})

If necessary, override the default plugin search path by setting the
environment variable PDAL_DRIVER_PATH to a list of directories that
pdal should search for plugins.

@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label May 6, 2023
@vicroms vicroms merged commit 1f7f116 into microsoft:master May 9, 2023
@cbrl cbrl deleted the pdal-2.5.3 branch May 20, 2023 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants