Skip to content

Fix two CMP warnings in CMake >= 4.1 and 4.4 - #2704

Merged
dstebila merged 2 commits into
open-quantum-safe:mainfrom
Jacalz:cmake-policy-fixes
Nov 18, 2026
Merged

dstebila merged 2 commits into
open-quantum-safe:mainfrom
Jacalz:cmake-policy-fixes

Conversation

@Jacalz

@Jacalz Jacalz commented Nov 13, 2026

Copy link
Copy Markdown
Contributor

This avoids two warnings that pop up with newer CMake versions. In the first case, we don't want to expand any variables other than our own. Because of how CMake handles if-statements, this led to us reading and expanding external variables even though it was gated behind the first clause.

In the second, CMake accidentally allowed MSVC to be set for assembly. Simply turning it off is fine as our assembly files are gated for other platforms anyway.

@dstebila

Copy link
Copy Markdown
Member

Thanks very much for the fix, @Jacalz! Would you be able to amend your commit with the DCO sign-off?

This avoids two warnings that pop up with newer CMake versions. In the first case, we don't want to expand any variables other than our own. In the second, CMake accidentally allowed MSVC to be set for assembly. Simply turning it off is fine as our assembly files are gated for other platforms anyway.

Signed-off-by: Jacalz <jacalz@tutanota.com>
@Jacalz
Jacalz force-pushed the cmake-policy-fixes branch from 5531416 to 5e4bc4f Compare November 17, 2026 19:55
@Jacalz

Jacalz commented Nov 17, 2026

Copy link
Copy Markdown
Contributor Author

Absolutely. Should be fine now :)

@coveralls

coveralls commented Nov 18, 2026 •

Copy link
Copy Markdown

Coverage Status

coverage: 79.958%. first build — Jacalz:cmake-policy-fixes into open-quantum-safe:main

@dstebila
dstebila merged commit 7624b37 into open-quantum-safe:main Nov 18, 2026
76 checks passed
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.

3 participants