CMakeLists.txt: fix build with ninja#8835
Merged
edsiper merged 1 commit intofluent:masterfrom Jun 6, 2024
Merged
Conversation
Contributor
Author
|
@edsiper, can you consider this PR? |
cosmo0920
requested changes
Jun 5, 2024
Contributor
cosmo0920
left a comment
There was a problem hiding this comment.
Just specifying fixed "make" is not proper option for Windows.
Instead, how about using the following lines:
if (CMAKE_GENERATOR MATCHES "Ninja")
if (FLB_SYSTEM_WINDOWS)
MESSAGE(FATAL_ERROR "Building with Ninja is not supported on Windows")
else()
set(EXTERNAL_BUILD_TOOL "make")
endif()
else()
set(EXTERNAL_BUILD_TOOL "$(MAKE)")
endif()and using ${EXTERNAL_BUILD_TOOL} in the following ExternalProject_Add?
This could be supporting Windows environment and preserve the previous behavior without specifying Ninja genator.
$ cmake -GNinja -B build/ && cmake --build build/
Results in this error:
ninja: error: build.ninja:158: bad $-escape (literal $ must be written as $$)
Replacing the $(MAKE) command with make gives us this new error:
ninja: error: 'backtrace-prefix/lib/libbacktrace.a', needed by 'bin/fluent-bit', missing and no known rule to make it
So fix that by properly defining the BUILD_BYPRODUCTS.
(Also see https://cmake.org/cmake/help/latest/module/ExternalProject.html#build-step-options)
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
b9360a0 to
f3fbcda
Compare
cosmo0920
approved these changes
Jun 6, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Results in this error:
Replacing the $(MAKE) command with make gives us this new error:
So fix that by properly defining the BUILD_BYPRODUCTS. (Also see https://cmake.org/cmake/help/latest/module/ExternalProject.html#build-step-options)
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.