Skip to content

build: Do not install manpages on Android, always use gnuinstalldirs unless we do our own thing, fixing install. #573

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
rpavlik merged 3 commits into from
Jan 9, 2026
Merged

build: Do not install manpages on Android, always use gnuinstalldirs unless we do our own thing, fixing install. #573

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
5c8fc0e
build: Do not install manpages on Android, fixing install.
rpavlik Nov 24, 2025
9f2eaae
build: Use GNUInstallDirs on Android if not using per-arch directorie…
rpavlik Nov 24, 2025
164583c
ci: Fix macOS builds.
rpavlik Jan 9, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/macOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
strategy:
matrix:
device: [
macos-13, # Tests Mac x86_64
macos-14, # Tests Mac arm64
macos-15-intel, # Tests Mac x86_64
macos-latest, # Tests Mac arm64
]
runs-on: ${{ matrix.device }}

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ elseif(ANDROID AND INSTALL_TO_ARCHITECTURE_PREFIXES)
)
endif()

elseif(NOT ANDROID)
else()
include(GNUInstallDirs)
endif()

Expand Down
5 changes: 5 additions & 0 deletions changes/sdk/pr.573.gh.OpenXR-SDK-Source.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- issue.568.gh.OpenXR-SDK-Source
- issue.2645.gl
---
Fix: Do not attempt to install manpages on Android, and ensure all directory prefixes are populated, fixing CMake install.
2 changes: 1 addition & 1 deletion src/tests/list/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ install(
TARGETS openxr_runtime_list RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT openxr_runtime_list
)
if(NOT WIN32)
if(NOT WIN32 AND NOT ANDROID)
install(
FILES openxr_runtime_list.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/
Expand Down
2 changes: 1 addition & 1 deletion src/tests/list_json/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if(NOT ANDROID)
COMPONENT openxr_runtime_list_json
)
endif()
if(NOT WIN32)
if(NOT WIN32 AND NOT ANDROID)
install(
FILES openxr_runtime_list_json.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/
Expand Down