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: Fix msh3-config.cmake configuration #240

Merged
merged 1 commit into from
Dec 24, 2024
Merged

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Dec 19, 2024

  • Chainloading the exported config has an expression based on ${SELF_DIR}.
    • The actual value is not known at msh3 build time.
    • Due to lack of @ONLY, configure_file substitutes the expression with an empty string at msh3 build time. This makes the exported config unusable.
    • The desired values is available as ${CMAKE_CURRENT_LIST_DIR} when the configuration is used.
    • Updating the expression and using @ONLY fixes chainloading and simplifies maintenance of msh4-config.cmake.in by separating build-time substitutions (@VAR@) from usage-time substitutions (${VAR}). This is common practice in generating CMake config files.

(The cmake config template still carries the @FILENAME_DEP_REPLACE@ placeholder which is probably copied from msquic but not set in msh3.)

@nibanks
Copy link
Owner

nibanks commented Dec 19, 2024

Can you please provide more description as to why this is necessary?

@dg0yt
Copy link
Contributor Author

dg0yt commented Dec 24, 2024

Update PR description.

@nibanks nibanks merged commit 3a53343 into nibanks:main Dec 24, 2024
21 checks passed
@dg0yt dg0yt deleted the cmake branch December 25, 2024 09:14
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.

2 participants