diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 24e7e3bf5..faf22529d 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -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 }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 443e67af2..c5430202d 100644 --- 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 new file mode 100644 index 000000000..69607c9ba --- /dev/null +++ b/changes/sdk/pr.573.gh.OpenXR-SDK-Source.md @@ -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. diff --git a/src/tests/list/CMakeLists.txt b/src/tests/list/CMakeLists.txt index 19f04f55d..c4d327d7f 100644 --- a/src/tests/list/CMakeLists.txt +++ b/src/tests/list/CMakeLists.txt @@ -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/ diff --git a/src/tests/list_json/CMakeLists.txt b/src/tests/list_json/CMakeLists.txt index 7e2504173..c19103c3a 100644 --- a/src/tests/list_json/CMakeLists.txt +++ b/src/tests/list_json/CMakeLists.txt @@ -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/