From 107e06f9403d0ad26a04a099b45c2d746ef08c6f Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 20 Sep 2021 22:09:59 +0300 Subject: Include gctest to the main solution --- gctest/solution/genie.lua | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'gctest/solution/genie.lua') diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua index 2f56616..a63f1f5 100644 --- a/gctest/solution/genie.lua +++ b/gctest/solution/genie.lua @@ -1,20 +1,20 @@ -solution 'gctest' +if not solution() then + solution 'gctest' if _ACTION ~= 'jcdb' then platforms { 'x32', 'x64' } configurations {'Debug', 'Release'} else configurations {'Debug'} + platforms { 'x64' } end flags { 'FatalWarnings', 'ExtraWarnings', - 'Cpp17', 'Symbols', } + defines { - '_SCL_SECURE_NO_WARNINGS', - '_CRT_SECURE_NO_WARNINGS', - 'MTR_ENABLED', + '_SCL_SECURE_NO_WARNINGS', } local root = '../build/' @@ -27,11 +27,23 @@ solution 'gctest' flags 'OptimizeSpeed' targetdir(root .. 'bin/Release') objdir(root .. 'obj/Release') + configuration '*' +end + +function setup() + flags 'Cpp17' + defines { + '_SCL_SECURE_NO_WARNINGS', + '_CRT_SECURE_NO_WARNINGS', + 'MTR_ENABLED', + } + -- GCC generates a warning for uninitialized data in -- std::normal_distribution configuration 'gcc' removeflags 'ExtraWarnings' configuration '*' +end project 'test_bench' kind 'StaticLib' @@ -41,16 +53,19 @@ solution 'gctest' '../src/minitrace.cpp', } removeflags 'ExtraWarnings' + setup() project 'leak_gc' kind 'ConsoleApp' language 'C++' files '../src/gc_leak.cpp' links 'test_bench' + setup() project 'dummy_gc' kind 'ConsoleApp' language 'C++' files '../src/gc_dummy.cpp' links 'test_bench' + setup() -- cgit v1.3.1-26-gb76a