Skip to content

Fix cmake warning #116000

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

Merged
merged 1 commit into from
May 27, 2025
Merged

Fix cmake warning #116000

merged 1 commit into from
May 27, 2025

Conversation

radekdoulik
Copy link
Member

Fixes #115998

@radekdoulik radekdoulik added this to the 10.0.0 milestone May 26, 2025
@Copilot Copilot AI review requested due to automatic review settings May 26, 2025 17:04
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the endif comment in configureplatform.cmake to match the full conditional and eliminate a CMake warning.

  • Expanded the endif comment to include both emscripten and browser.
  • Resolves mismatch between if and endif conditions causing the warning.

@github-actions github-actions bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label May 26, 2025
@radekdoulik radekdoulik requested a review from filipnavara May 26, 2025 17:11
@radekdoulik radekdoulik removed the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label May 26, 2025
Copy link
Contributor

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

@radekdoulik radekdoulik enabled auto-merge (squash) May 26, 2025 17:29
@@ -437,7 +437,7 @@ endif(CLR_CMAKE_TARGET_OS STREQUAL haiku)
if(CLR_CMAKE_TARGET_OS STREQUAL emscripten OR CLR_CMAKE_TARGET_OS STREQUAL browser)
set(CLR_CMAKE_TARGET_UNIX 1)
set(CLR_CMAKE_TARGET_BROWSER 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL emscripten)
endif(CLR_CMAKE_TARGET_OS STREQUAL emscripten OR CLR_CMAKE_TARGET_OS STREQUAL browser)
Copy link
Member

Choose a reason for hiding this comment

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

We can also change this to not have the condition repeated.

Suggested change
endif(CLR_CMAKE_TARGET_OS STREQUAL emscripten OR CLR_CMAKE_TARGET_OS STREQUAL browser)
endif()

Copy link
Member

Choose a reason for hiding this comment

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

Yes, but that would make it inconsistent with the rest of the file.

Copy link
Member

Choose a reason for hiding this comment

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

I never liked the repeated condition but I agree this should be made in a different PR if we were to change it

@akoeplinger
Copy link
Member

/ba-g unrelated infrastructure issue

@radekdoulik radekdoulik merged commit d666a78 into dotnet:main May 27, 2025
151 of 153 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

CMake endif mismatch
4 participants