build: Use GNUInstallDirs on Android if not using per-arch directories for prefab

rpavlik · rpavlik · commit 9f2eaae9daaf · 2026-01-08T12:26:13.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,7 +128,7 @@ elseif(ANDROID AND INSTALL_TO_ARCHITECTURE_PREFIXES)
         )
     endif()
 
-elseif(NOT ANDROID)
+else()
     include(GNUInstallDirs)
 endif()
 
diff --git a/changes/sdk/pr.573.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.573.gh.OpenXR-SDK-Source.md
@@ -1,4 +1,5 @@
 ---
 - issue.568.gh.OpenXR-SDK-Source
+- issue.2645.gl
 ---
-Fix: Do not attempt to install manpages on Android, fixing CMake install.
+Fix: Do not attempt to install manpages on Android, and ensure all directory prefixes are populated, fixing CMake install.

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ elseif(ANDROID AND INSTALL_TO_ARCHITECTURE_PREFIXES)`
`128`	`128`	`)`
`129`	`129`	`endif()`
`130`	`130`
`131`		`-elseif(NOT ANDROID)`
	`131`	`+else()`
`132`	`132`	`include(GNUInstallDirs)`
`133`	`133`	`endif()`
`134`	`134`