Skip to content
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

Jump to bottom

Using d suffix for debug library in Windows #229

Closed
wants to merge 3 commits into from
Closed

Using d suffix for debug library in Windows #229

wants to merge 3 commits into from

Conversation

matthieucoquet
Copy link
Contributor

Before this change, openxr-loader debug library was put in a Debug directory during install.
Now, the library would have a suffix and be in the same directory as the release library.

The suffix is d by default on Windows and is empty on Linux. It can be changed or removed using the OPENXR_DEBUG_POSTFIX variable:

cmake -dOPENXR_DEBUG_POSTFIX=my_suffix path_to_repo

In addition, I did a small clean for the headers target. Instead of manually define it in OpenXRConfig.cmake.in. I define it and export it in the CMakeLists.txt

I tested on Windows for static and dynamic lib and also on Linux.

rpavlik
rpavlik requested changes Nov 23, 2020
View reviewed changes
src/loader/CMakeLists.txt Show resolved Hide resolved
src/loader/OpenXRConfig.cmake.in Show resolved Hide resolved
rpavlik
rpavlik approved these changes Jan 26, 2021
View reviewed changes
Copy link
Contributor

@rpavlik rpavlik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've rebased this, made a few minor tweaks, and merged it. Thanks!

@rpavlik rpavlik closed this Jan 26, 2021
rpavlik added a commit that referenced this pull request Jan 28, 2021
@rpavlik
OpenXR SDK 1.0.14 (2021-01-27)
42b694c 
This release contains a collection of fixes and improvements, including
one new vendor extension. Notably, we have relicensed all files that
become part of the loader, so the loader may be “Apache-2.0 OR MIT” for
downstream license compatibility.

-   Registry
    -   Add new XR_FB_android_surface_swapchain_create vendor extension.
        (internal MR 1939, internal issue 1493, internal MR 1968)
    -   Add missing optional attributes to XR_KHR_vulkan_enable2
        structs. Fixes validation layer. (OpenXR-Docs/#72)
    -   Correction to locationFlags field in XrHandJointLocationEXT to
        be optional. (internal MR 1945)
    -   Reserve vendor extensions for Varjo. (internal MR 1935)
    -   Reserve vendor extensions for Magic Leap. (internal MR 1967,
        internal MR 1970)
    -   Reserve extension number 143 to 148 for MSFT extensions.
        (internal MR 1969)
    -   Update Magic Leap ID and contact information. (internal MR 1967)
-   SDK
    -   Add ./ to the start of the library name in API layer manifests
        on Windows, so they are treated as a relative path. (internal MR
        1975)
    -   Fix searching for prerequisites in generated CMake config files.
        (internal MR 1963)
    -   Start shipping the OpenXR API layers with the release artifacts.
        (internal MR 1975)
    -   cmake: Debug library uses d suffix on Windows. CMake
        OPENXR_DEBUG_POSTFIX variable can be set to something else to
        change it. (OpenXR-SDK-Source/#229)
    -   hello_xr: Remove redundant call to xrInitializeLoaderKHR.
        (internal MR 1933)
    -   hello_xr: Return supported sample count as 1 for GLES, GL and
        D3D11. (internal MR 1962)
    -   hello_xr: Use android.app.NativeActivity correctly in place of
        NativeActivity subclass. (internal MR 1976)
    -   hello_xr: On Vulkan, explicitly add surface extensions for
        mirror window. (OpenXR-SDK-Source/#230, internal MR 1934)
    -   loader: Relicense all files that become part of the loader, so
        the loader may be “Apache-2.0 OR MIT” for downstream license
        compatibility. (internal MR 1937, internal issue 1449,
        OpenXR-SDK-Source/#205)
    -   loader: Protect against the application overriding loader
        symbols. (internal MR 1961)
    -   loader: Handle JSON files in the search path that are not
        objects. (internal MR 1979)
rhabacker pushed a commit to rhabacker/OpenXR-SDK-Source that referenced this pull request Nov 16, 2022
@rpavlik
OpenXR SDK 1.0.14 (2021-01-27)
5900c51 
This release contains a collection of fixes and improvements, including
one new vendor extension. Notably, we have relicensed all files that
become part of the loader, so the loader may be “Apache-2.0 OR MIT” for
downstream license compatibility.

-   Registry
    -   Add new XR_FB_android_surface_swapchain_create vendor extension.
        (internal MR 1939, internal issue 1493, internal MR 1968)
    -   Add missing optional attributes to XR_KHR_vulkan_enable2
        structs. Fixes validation layer. (OpenXR-Docs/KhronosGroup#72)
    -   Correction to locationFlags field in XrHandJointLocationEXT to
        be optional. (internal MR 1945)
    -   Reserve vendor extensions for Varjo. (internal MR 1935)
    -   Reserve vendor extensions for Magic Leap. (internal MR 1967,
        internal MR 1970)
    -   Reserve extension number 143 to 148 for MSFT extensions.
        (internal MR 1969)
    -   Update Magic Leap ID and contact information. (internal MR 1967)
-   SDK
    -   Add ./ to the start of the library name in API layer manifests
        on Windows, so they are treated as a relative path. (internal MR
        1975)
    -   Fix searching for prerequisites in generated CMake config files.
        (internal MR 1963)
    -   Start shipping the OpenXR API layers with the release artifacts.
        (internal MR 1975)
    -   cmake: Debug library uses d suffix on Windows. CMake
        OPENXR_DEBUG_POSTFIX variable can be set to something else to
        change it. (OpenXR-SDK-Source/KhronosGroup#229)
    -   hello_xr: Remove redundant call to xrInitializeLoaderKHR.
        (internal MR 1933)
    -   hello_xr: Return supported sample count as 1 for GLES, GL and
        D3D11. (internal MR 1962)
    -   hello_xr: Use android.app.NativeActivity correctly in place of
        NativeActivity subclass. (internal MR 1976)
    -   hello_xr: On Vulkan, explicitly add surface extensions for
        mirror window. (OpenXR-SDK-Source/KhronosGroup#230, internal MR 1934)
    -   loader: Relicense all files that become part of the loader, so
        the loader may be “Apache-2.0 OR MIT” for downstream license
        compatibility. (internal MR 1937, internal issue 1449,
        OpenXR-SDK-Source/KhronosGroup#205)
    -   loader: Protect against the application overriding loader
        symbols. (internal MR 1961)
    -   loader: Handle JSON files in the search path that are not
        objects. (internal MR 1979)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rpavlik rpavlik rpavlik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@matthieucoquet @rpavlik