Skip to content

Commit e93034a

Browse files
committed
OpenXR SDK 1.0.32.1 hotfix: Fix CMake build of loader on Universal Windows Platform
Also fix Azure Pipelines CI. GitOrigin-RevId: 401db2742417b942e594e2717a39979ecdf1af8f
1 parent 33c4600 commit e93034a

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.azure-pipelines/shared/build_linux.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ parameters:
1010
default: ""
1111
- name: sourceDir
1212
type: string
13-
default: "$(System.DefaultWorkingDirectory)"
13+
default: "$(Pipeline.Workspace)"
1414
- name: buildDir
1515
type: string
16-
default: build
16+
default: "$(Build.BinariesDirectory)"
1717

1818
steps:
19-
- checkout: self
20-
lfs: true
21-
- script: "rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }}"
19+
- script: "rm -rf ${{ parameters.buildDir }}"
2220
displayName: "Clean up build directory"
2321

2422
- script: "cmake -G Ninja -S . -B ${{ parameters.buildDir }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}"

HOTFIX

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1

changes/sdk/mr.3071.gl.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Loader: Fix loader build on Universal Windows Platform: build-system-only change. (Included in SDK hotfix 1.0.32.1.)

src/loader/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,17 +205,20 @@ elseif(WIN32)
205205
)
206206

207207
if(MSVC)
208+
if(DYNAMIC_LOADER)
209+
target_sources(
210+
openxr_loader
211+
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/openxr-loader.def"
212+
)
213+
endif()
214+
208215
if(DYNAMIC_LOADER AND NOT (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
209216
# If building DLLs, force static CRT linkage
210217
set_target_properties(
211218
openxr_loader
212219
PROPERTIES MSVC_RUNTIME_LIBRARY
213220
"MultiThreaded$<$<CONFIG:Debug>:Debug>"
214221
)
215-
target_sources(
216-
openxr_loader
217-
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/openxr-loader.def"
218-
)
219222
else()
220223
# WindowsStore (UWP) apps must be compiled with dynamic CRT linkage (default)
221224
# Otherwise for static libs, link the CRT dynamically

0 commit comments

Comments
 (0)