godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95338 from hakro/no_is_no 

Make sure not to generate the compile_commands.json when not asked
This commit is contained in:
Rémi Verschelde 2024-08-12 14:10:27 +02:00
parent 10ae73cc69 400800a86c
commit 5ae8250142
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -1011,11 +1011,12 @@ if env["vsproj"]:
env.vs_incs = [] env.vs_incs = []
env.vs_srcs = [] env.vs_srcs = []
if env["compiledb"] and env.scons_version < (4, 0, 0): if env["compiledb"]:
if env.scons_version < (4, 0, 0):
# Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later. # Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
print_error("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version) print_error("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version)
Exit(255) Exit(255)
if env.scons_version >= (4, 0, 0):
env.Tool("compilation_db") env.Tool("compilation_db")
env.Alias("compiledb", env.CompilationDatabase()) env.Alias("compiledb", env.CompilationDatabase())