Skip to content

[liblas] use supports expression #25354

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.

Sign up for GitHub

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

Closed
autoantwort wants to merge 1 commit into from
Closed

[liblas] use supports expression #25354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions ports/liblas/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@ vcpkg_download_distfile(ARCHIVE
)

vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE}
ARCHIVE "${ARCHIVE}"
OUT_SOURCE_PATH SOURCE_PATH
PATCHES
fix-boost-headers.patch
)

file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake)
file(REMOVE "${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake")
file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake")

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_OSGEO4W=OFF # Disable osgeo4w
-DWITH_TESTS=OFF
Expand All @@ -28,24 +27,24 @@ vcpkg_configure_cmake(
-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
)

vcpkg_install_cmake()
vcpkg_cmake_install()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")

if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake)
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake")

if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS)
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS)
endif()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
14 changes: 12 additions & 2 deletions ports/liblas/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"name": "liblas",
"version": "1.8.1",
"port-version": 9,
"port-version": 10,
"description": "A C/C++ library for reading and writing the very common LAS LiDAR format.",
"license": "BSD-3-Clause",
"supports": "!arm",
Copy link
Contributor

@dg0yt dg0yt Jun 21, 2022

Choose a reason for hiding this comment

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

Are you sure? (macOS, iOS, Android?)

Copy link
Contributor Author

@autoantwort autoantwort Jun 21, 2022

Choose a reason for hiding this comment

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

[4/37] /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DHAVE_LIBGEOTIFF=1 -DPROJ_DLL="" -Dlas_EXPORTS -I/Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/../include -isystem /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/include -fPIC  -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -g -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk -fPIC -MD -MT src/CMakeFiles/las.dir/classification.cpp.o -MF src/CMakeFiles/las.dir/classification.cpp.o.d -o src/CMakeFiles/las.dir/classification.cpp.o -c /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/classification.cpp
FAILED: src/CMakeFiles/las.dir/classification.cpp.o 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DHAVE_LIBGEOTIFF=1 -DPROJ_DLL="" -Dlas_EXPORTS -I/Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/../include -isystem /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/include -fPIC  -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -g -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk -fPIC -MD -MT src/CMakeFiles/las.dir/classification.cpp.o -MF src/CMakeFiles/las.dir/classification.cpp.o.d -o src/CMakeFiles/las.dir/classification.cpp.o -c /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/classification.cpp
In file included from /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/classification.cpp:43:
In file included from /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/../include/liblas/detail/private_utility.hpp:46:
/Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg/buildtrees/liblas/src/libLAS-1-c08fab38cc.clean/src/../include/liblas/detail/endian.hpp:96:3: error: The file liblas/detail/endian.hpp needs to be set up for your CPU type.
# error The file liblas/detail/endian.hpp needs to be set up for your CPU type.
  ^
1 error generated.

Copy link
Member

@vicroms vicroms Jun 30, 2022

Choose a reason for hiding this comment

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

This seems to be patched but unreleased and the authors have deprecated the library since June 18, 2020.

Homebrew/homebrew-core#93631

I think this change to supports is fine, not asking to update library at this time.

Copy link
Contributor

@Cheney-W Cheney-W Jul 1, 2022

Choose a reason for hiding this comment

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

@vicroms If you think this PR has nothing to modify at the moment, please remove the vcpkg-team-review label and add reviewed label.

"dependencies": [
"boost-detail",
"boost-filesystem",
Expand All @@ -14,7 +16,15 @@
"boost-system",
"boost-thread",
"boost-uuid",
"libgeotiff"
"libgeotiff",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"jpeg": {
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ libigl:x64-uwp=fail
libirecovery:x64-windows-static-md=fail
# 120 min build time for libjxl arm-uwp-rel, reason unknown
libjxl:arm-uwp=skip
liblas:arm64-windows=fail
liblemon:arm-uwp=fail
liblemon:x64-uwp=fail
liblo:arm-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3746,7 +3746,7 @@
},
"liblas": {
"baseline": "1.8.1",
"port-version": 9
"port-version": 10
},
"liblbfgs": {
"baseline": "1.10",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/liblas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2298191e0c3e2866daf3b199bc8046c9a25f37fa",
"version": "1.8.1",
"port-version": 10
},
{
"git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005",
"version": "1.8.1",
Expand Down