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

[ML] Generate windows resource files using CMake functionality #2321

Merged
merged 8 commits into from
Jun 23, 2022
Merged

[ML] Generate windows resource files using CMake functionality #2321

merged 8 commits into from
Jun 23, 2022

Conversation

edsavage
Copy link
Contributor

@edsavage edsavage commented Jun 22, 2022 •
edited
Loading

Relates #2311

droberts195
droberts195 reviewed Jun 22, 2022
View reviewed changes
cmake/functions.cmake Outdated Show resolved Hide resolved
cmake/functions.cmake Show resolved Hide resolved
cmake/functions.cmake Show resolved Hide resolved
cmake/functions.cmake Show resolved Hide resolved
@droberts195 droberts195 changed the title [ML] Generate windows resource files in a portable way [ML] Generate windows resource files using CMake functionality Jun 22, 2022
droberts195
droberts195 reviewed Jun 22, 2022
View reviewed changes
mk/ml.rc.in Outdated Show resolved Hide resolved
droberts195
droberts195 approved these changes Jun 23, 2022
View reviewed changes
Copy link
Contributor

@droberts195 droberts195 left a comment

Choose a reason for hiding this comment

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

LGTM

cmake/functions.cmake
@ONLY
)

set(ML_FILEFLAGS ${ML_FILEFLAGS} PARENT_SCOPE)
Copy link
Contributor

Choose a reason for hiding this comment

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

This is OK, but it does now mean that in addition to the resource file all our C++ code is getting compiled with this extra symbol defined. I'm sure it won't be a problem as none of our source will contain this string.

It might be nicer to substitute it only into the resource file using the @ML_FILEFLAGS@ syntax. Don't bother about doing this in this PR, because we want to get the overall feature branch merged soon. But maybe you could have a look at tidying this up next week in a separate PR against the main branch.

@edsavage edsavage merged commit a939614 into elastic:feature/cmake_build Jun 23, 2022
@edsavage edsavage deleted the cmake_generate_windows_resource_files branch June 23, 2022 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@droberts195 droberts195 droberts195 approved these changes

Assignees
No one assigned
Labels
>build :ml >non-issue review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@edsavage @droberts195