Skip to content

fix CMAKE_SYSTEM_NAME for Android and QNX #372

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

Merged
merged 3 commits into from
Sep 16, 2024
Merged

fix CMAKE_SYSTEM_NAME for Android and QNX #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba4a14b
fix CMAKE_SYSTEM_NAME for Android and QNX
getim Sep 5, 2024
a6c29c3
Merge branch 'main' into tim/fix-android-qnx-system-name
mvukov Sep 14, 2024
525a256
Merge branch 'main' into tim/fix-android-qnx-system-name
getim Sep 16, 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
55 changes: 42 additions & 13 deletions repositories/cyclonedds.BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ selects.config_setting_group(
)

selects.config_setting_group(
name = "android_or_qnx",
match_any = [
name = "android_with_shm",
match_all = [
"@platforms//os:android",
"@platforms//os:qnx",
":enable_shm_on",
],
)

selects.config_setting_group(
name = "android_or_qnx_with_shm",
name = "qnx_with_shm",
match_all = [
":android_or_qnx",
"@platforms//os:qnx",
":enable_shm_on",
],
)
Expand All @@ -64,9 +64,17 @@ selects.config_setting_group(
)

selects.config_setting_group(
name = "android_or_qnx_without_shm",
name = "android_without_shm",
match_all = [
":android_or_qnx",
"@platforms//os:android",
":enable_shm_off",
],
)

selects.config_setting_group(
name = "qnx_without_shm",
match_all = [
"@platforms//os:qnx",
":enable_shm_off",
],
)
Expand Down Expand Up @@ -104,10 +112,17 @@ cache_entries_linux_and_macos = {
"ENABLE_SOURCE_SPECIFIC_MULTICAST": "ON",
}

cache_entries_qnx = {
cache_entries_android_and_qnx = {
"ENABLE_SOURCE_SPECIFIC_MULTICAST": "OFF",
"ENABLE_IPV6": "OFF",
"CMAKE_SYSTEM_NAME": "ANDROID_OR_QNX",
}

cache_entries_android = {
"CMAKE_SYSTEM_NAME": "Android",
}

cache_entries_qnx = {
"CMAKE_SYSTEM_NAME": "QNX",
}

cache_entries_with_shm = {
Expand All @@ -132,30 +147,44 @@ cmake(
cache_entries_linux_and_macos,
cache_entries_with_shm,
),
":android_or_qnx_with_shm": dicts.add(
":android_with_shm": dicts.add(
cache_entries,
cache_entries_android,
cache_entries_android_and_qnx,
cache_entries_with_shm,
),
":qnx_with_shm": dicts.add(
cache_entries,
cache_entries_qnx,
cache_entries_android_and_qnx,
cache_entries_with_shm,
),
":linux_or_macos_without_shm": dicts.add(
cache_entries,
cache_entries_linux_and_macos,
cache_entries_without_shm,
),
":android_or_qnx_without_shm": dicts.add(
":android_without_shm": dicts.add(
cache_entries,
cache_entries_android,
cache_entries_android_and_qnx,
cache_entries_without_shm,
),
":qnx_without_shm": dicts.add(
cache_entries,
cache_entries_qnx,
cache_entries_android_and_qnx,
cache_entries_without_shm,
),
},
no_match_error = "Unsupported build configuration",
),
generate_args = ["-GNinja"],
lib_source = ":all_srcs",
linkopts = select(
linkopts = selects.with_or(
{
":linux_or_macos": ["-lpthread"],
":android_or_qnx": [],
("@platforms//os:android", "@platforms//os:qnx"): [],
},
no_match_error = "Supported OSs: Android, Linux, macOS, QNX",
),
Expand Down
12 changes: 10 additions & 2 deletions repositories/iceoryx.BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ cache_entries = {
"CCACHE": "OFF",
}

cache_entries_android = {
"CMAKE_SYSTEM_NAME": "Android",
}

cache_entries_qnx = {
"CMAKE_SYSTEM_NAME": "ANDROID_OR_QNX",
"CMAKE_SYSTEM_NAME": "QNX",
}

# Depends on libacl. On Ubuntu install as `sudo apt-get install libacl1-dev`.
Expand All @@ -27,7 +31,11 @@ cmake(
cache_entries = selects.with_or(
{
("@platforms//os:linux", "@platforms//os:macos"): cache_entries,
("@platforms//os:android", "@platforms//os:qnx"): dicts.add(
"@platforms//os:android": dicts.add(
cache_entries,
cache_entries_android,
),
"@platforms//os:qnx": dicts.add(
cache_entries,
cache_entries_qnx,
),
Expand Down