Fix compiledb duplicate warning

OpenVicProject · Nov 11, 2023 · ca0535a · ca0535a
1 parent f94b4b1
commit ca0535a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/SConstruct b/SConstruct
@@ -12,9 +12,12 @@ env = SConscript("scripts/SConstruct")
 
 env.PrependENVPath("PATH", os.getenv("PATH"))
 
+OLD_ARGS = ARGUMENTS.copy()
+ARGUMENTS["compiledb"] = False
 opts = env.SetupOptions()
 
 env.FinalizeOptions()
+ARGUMENTS = OLD_ARGS
 
 # Needs Clone, else godot-cpp builds using our modified environment variables. eg: godot-cpp builds on C++20
 OLD_ARGS = ARGUMENTS.copy()
@@ -82,12 +85,8 @@ else:
 
 default_args = [library]
 
-# Add compiledb if the option is set
-if env.get("compiledb", False):
-    default_args += ["compiledb"]
-
 if "env" in locals():
     # FIXME: This method mixes both cosmetic progress stuff and cache handling...
     env.show_progress(env)
 
-Default(default_args)
+Default(*default_args)
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation
diff --git a/scripts b/scripts
+9 −2		SConstruct
+1 −1		deps/lexy-vdf
+1 −1		deps/openvic-dataloader
+1 −1		scripts