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.

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

[pcl] When cross-compiling pcl for Android pre-set some cache variables. #41506

Closed
wants to merge 4 commits into from
Closed

[pcl] When cross-compiling pcl for Android pre-set some cache variables. #41506

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dab3852
When compiling for Android, override cmake configure values for HAVE_…
jackjansen Oct 11, 2024
b88895d
Update ports/pcl/portfile.cmake
jackjansen Oct 13, 2024
0a2e17f
Updated sha
jackjansen Oct 13, 2024
bbf8eaa
Update ports/pcl/portfile.cmake
jackjansen Oct 30, 2024
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
10 changes: 10 additions & 0 deletions ports/pcl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
#apps BUILD_apps_3d_rec_framework
)

set(EXTRA_ANDROID_OPTIONS "")
if(VCPKG_TARGET_IS_ANDROID)
message(STATUS "Skip configure-time checks for Android")
jackjansen marked this conversation as resolved.
Show resolved Hide resolved
set(EXTRA_ANDROID_OPTIONS
-DHAVE_MM_MALLOC_EXITCODE=OFF
-DHAVE_POSIX_MEMALIGN_EXITCODE=OFF
)
endif()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
Expand All @@ -61,6 +70,7 @@ vcpkg_cmake_configure(
-DWITH_RSSDK2=OFF
# FEATURES
${FEATURE_OPTIONS}
${EXTRA_ANDROID_OPTIONS}
OPTIONS_DEBUG
-DBUILD_apps=OFF
-DBUILD_examples=OFF
Expand Down
2 changes: 1 addition & 1 deletion ports/pcl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pcl",
"version": "1.14.1",
"port-version": 1,
"port-version": 2,
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
"homepage": "https://github.com/PointCloudLibrary/pcl",
"license": "BSD-3-Clause",
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 @@ -6878,7 +6878,7 @@
},
"pcl": {
"baseline": "1.14.1",
"port-version": 1
"port-version": 2
},
"pcre": {
"baseline": "8.45",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "abf851c3ef88461bed0d7160cede473848191541",
"version": "1.14.1",
"port-version": 2
},
{
"git-tree": "e55506ffdfffe9bc2104eadddea53dde27686a8d",
"version": "1.14.1",
Expand Down