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.

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

cmake: Only search for MASM when using MSVC #1291

Merged
merged 1 commit into from
Sep 13, 2023
Merged

cmake: Only search for MASM when using MSVC #1291

merged 1 commit into from
Sep 13, 2023

Conversation

sfan5
Copy link
Contributor

@sfan5 sfan5 commented Sep 12, 2023

When cross-compiling with MinGW CMake somehow says it finds MASM and the build subsequently fails since gcc doesn't understand /Fa or /Od. While this could possible be a CMake bug I think it's a quick fix here.
This shouldn't break anything else as MASM is restricted to MSVC and not available in other situations.

reproduction: same script as #1278 just remove the -DUSE_MASM=OFF

@ci-tester-lunarg
Copy link

Author sfan5 not on autobuild list. Waiting for curator authorization before starting CI build.

1 similar comment
@ci-tester-lunarg
Copy link

Author sfan5 not on autobuild list. Waiting for curator authorization before starting CI build.

@CLAassistant
Copy link

CLAassistant commented Sep 12, 2023

CLA assistant check
All committers have signed the CLA.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build queued with queue ID 41269.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build # 2156 running.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build # 2156 passed.

Copy link
Contributor

@juan-lunarg juan-lunarg left a comment

Choose a reason for hiding this comment

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

Update .github\workflows\build.yml

mingw-no-asm sets -D USE_MASM=OFF which shouldn't be needed with this change now.

loader/CMakeLists.txt Outdated Show resolved Hide resolved
@ci-tester-lunarg
Copy link

Author sfan5 not on autobuild list. Waiting for curator authorization before starting CI build.

1 similar comment
@ci-tester-lunarg
Copy link

Author sfan5 not on autobuild list. Waiting for curator authorization before starting CI build.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build queued with queue ID 41316.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build # 2158 running.

@ci-tester-lunarg
Copy link

CI Vulkan-Loader build # 2158 passed.

Copy link
Contributor

@juan-lunarg juan-lunarg left a comment

Choose a reason for hiding this comment

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

LGTM but @charles-lunarg should double check

Copy link
Collaborator

@charles-lunarg charles-lunarg left a comment

Choose a reason for hiding this comment

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

Yup looks fine!

@charles-lunarg charles-lunarg merged commit e2e3cb9 into KhronosGroup:main Sep 13, 2023
38 checks passed
@sfan5 sfan5 deleted the mingw_masm branch September 13, 2023 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants