From 4080992b388fb3275accaf8ab2644be2e124ac9a Mon Sep 17 00:00:00 2001 From: Adam Scott Date: Thu, 14 Mar 2024 10:06:45 -0400 Subject: [PATCH] Fix `compiledb` SCons tool availability --- SConstruct | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/SConstruct b/SConstruct index c11fd50497d..753cea40e33 100644 --- a/SConstruct +++ b/SConstruct @@ -956,25 +956,25 @@ if selected_platform in platform_list: env.vs_incs = [] env.vs_srcs = [] - if env["compiledb"]: + # CompileDB + from SCons import __version__ as scons_raw_version + + scons_ver = env._get_major_minor_revision(scons_raw_version) + if env["compiledb"] and scons_ver < (4, 0, 0): # 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) - + print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version) + Exit(255) + if scons_ver >= (4, 0, 0): env.Tool("compilation_db") env.Alias("compiledb", env.CompilationDatabase()) + # Threads if env["threads"]: env.Append(CPPDEFINES=["THREADS_ENABLED"]) + # Build subdirs, the build order is dependent on link order. Export("env") - # Build subdirs, the build order is dependent on link order. SConscript("core/SCsub") SConscript("servers/SCsub") SConscript("scene/SCsub")