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

SCons: Fix compilation database generation with MSVC #65440

Merged
merged 1 commit into from
Sep 7, 2022
Merged

SCons: Fix compilation database generation with MSVC #65440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,19 +438,6 @@ if selected_platform in platform_list:
)
env.SetOption("num_jobs", safer_cpu_count)

if env["compiledb"]:
# Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
from SCons import __version__ as scons_raw_version

scons_ver = env._get_major_minor_revision(scons_raw_version)

if scons_ver < (4, 0, 0):
print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version)
Exit(255)

env.Tool("compilation_db")
env.Alias("compiledb", env.CompilationDatabase())

# 'dev' and 'production' are aliases to set default options if they haven't been set
# manually by the user.
if env["dev"]:
Expand Down Expand Up @@ -840,6 +827,19 @@ if selected_platform in platform_list:
env.vs_incs = []
env.vs_srcs = []

if env["compiledb"]:
# Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
from SCons import __version__ as scons_raw_version

scons_ver = env._get_major_minor_revision(scons_raw_version)

if scons_ver < (4, 0, 0):
print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version)
Exit(255)

env.Tool("compilation_db")
env.Alias("compiledb", env.CompilationDatabase())

Export("env")

# Build subdirs, the build order is dependent on link order.
Expand Down