Add buildoptions, linkoptions support

Author: nickclark2016

modules/ninja/ninja_cpp.lua

@@ -34,9 +34,7 @@ function m.generate(prj)
 	_p("") -- Empty line at end of file
 end
 
--- Generate all ninja rules (compile, link, etc.)
 function m.rules(prj)
-	-- Generate rules for each configuration to handle different toolsets
 	local rulesDone = {}
 
 	for cfg in project.eachconfig(prj) do
@@ -304,6 +302,9 @@ function m.getCFlags(cfg, toolset)
 
 	local forceincludes = toolset.getforceincludes(cfg)
 	flags = table.join(flags, forceincludes)
+
+	local buildopts = cfg.buildoptions or {}
+	flags = table.join(flags, buildopts)
 
 	return flags
 end
@@ -323,6 +324,9 @@ function m.getCxxFlags(cfg, toolset)
 
 	local forceincludes = toolset.getforceincludes(cfg)
 	flags = table.join(flags, forceincludes)
+
+	local buildopts = cfg.buildoptions or {}
+	flags = table.join(flags, buildopts)
 
 	return flags
 end
@@ -333,6 +337,9 @@ function m.getLdFlags(cfg, toolset)
 
 	local toolFlags = toolset.getldflags(cfg)
 	flags = table.join(flags, toolFlags)
+
+	local linkopts = cfg.linkoptions or {}
+	flags = table.join(flags, linkopts)
 
 	local libdirs = toolset.getLibraryDirectories(cfg)
 	flags = table.join(flags, libdirs)

modules/ninja/tests/test_ninja_config.lua

@@ -370,6 +370,76 @@ target_MyProject_Debug = MyProject
 	end
 
 
+--
+-- Check that buildoptions are included in flags.
+--
+
+	function suite.configVars_withBuildOptions_Linux()
+		toolset "gcc"
+		_OS = "Linux"
+		kind "ConsoleApp"
+		files { "main.cpp" }
+		buildoptions { "-Wall", "-Wextra" }
+		
+		local cfg = prepare()
+		cpp.configurationVariables(cfg)
+		
+		test.capture [[
+cflags_MyProject_Debug = -Wall -Wextra
+cxxflags_MyProject_Debug = -Wall -Wextra
+ldflags_MyProject_Debug = -s
+objdir_MyProject_Debug = obj/Debug
+targetdir_MyProject_Debug = bin/Debug
+target_MyProject_Debug = MyProject
+
+		]]
+	end
+
+
+	function suite.configVars_withBuildOptions_Windows()
+		toolset "msc"
+		_OS = "Windows"
+		kind "ConsoleApp"
+		files { "main.cpp" }
+		buildoptions { "/W4", "/WX" }
+		
+		local cfg = prepare()
+		cpp.configurationVariables(cfg)
+		
+		test.capture [[
+cflags_MyProject_Debug = /MD /W4 /WX
+cxxflags_MyProject_Debug = /MD /EHsc /W4 /WX
+ldflags_MyProject_Debug = /NOLOGO
+objdir_MyProject_Debug = obj/Debug
+targetdir_MyProject_Debug = bin/Debug
+target_MyProject_Debug = MyProject.exe
+
+		]]
+	end
+
+
+	function suite.configVars_withBuildOptions_Macosx()
+		toolset "gcc"
+		_OS = "macosx"
+		kind "ConsoleApp"
+		files { "main.cpp" }
+		buildoptions { "-Wall", "-Wextra" }
+		
+		local cfg = prepare()
+		cpp.configurationVariables(cfg)
+		
+		test.capture [[
+cflags_MyProject_Debug = -Wall -Wextra
+cxxflags_MyProject_Debug = -Wall -Wextra
+ldflags_MyProject_Debug = -Wl,-x
+objdir_MyProject_Debug = obj/Debug
+targetdir_MyProject_Debug = bin/Debug
+target_MyProject_Debug = MyProject
+
+		]]
+	end
+
+
 ---
 -- C/C++ flags function tests
 ---