mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-06-20 23:44:08 +00:00
Make cxxtest optional
Remove mocks as they are no longer used making cxxtest effectively optional. Fixes: #8618 Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
@@ -1078,22 +1078,6 @@ function setup_all_libs ()
|
||||
filter "action:vs*"
|
||||
buildoptions { "/wd4551" }
|
||||
filter {}
|
||||
|
||||
|
||||
-- CxxTest mock function support
|
||||
extern_libs = {
|
||||
"boost",
|
||||
"cxxtest",
|
||||
}
|
||||
|
||||
-- 'real' implementations, to be linked against the main executable
|
||||
-- (files are added manually and not with setup_static_lib_project
|
||||
-- because not all files in the directory are included)
|
||||
setup_static_lib_project("mocks_real", {}, extern_libs, { no_default_link = 1, no_pch = 1 })
|
||||
files { "mocks/*.h", source_root.."mocks/*_real.cpp" }
|
||||
-- 'test' implementations, to be linked against the test executable
|
||||
setup_static_lib_project("mocks_test", {}, extern_libs, { no_default_link = 1, no_pch = 1 })
|
||||
files { source_root.."mocks/*.h", source_root.."mocks/*_test.cpp" }
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
@@ -1160,8 +1144,6 @@ function setup_main_exe ()
|
||||
linkgroups 'On'
|
||||
filter {}
|
||||
|
||||
links { "mocks_real" }
|
||||
|
||||
local extra_params = {
|
||||
extra_files = { "main.cpp" },
|
||||
no_pch = 1
|
||||
@@ -1577,7 +1559,6 @@ function setup_tests()
|
||||
links { static_lib_names_release }
|
||||
filter { }
|
||||
|
||||
links { "mocks_test" }
|
||||
if not _OPTIONS["without-atlas"] then
|
||||
links { "AtlasObject" }
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user