diff --git a/building/main.cpp b/building/main.cpp index 9185ea4..c45780a 100644 --- a/building/main.cpp +++ b/building/main.cpp @@ -15,7 +15,7 @@ struct TestWebsiteBuildScript { std::vector version_flags = {"--std", "c++14", "-D", "_POSIX_C_SOURCE=200809L"}; std::vector debug_defines_release = {"_GLIBCXX_DEBUG"}; - std::vector debug_defines_debug = {"_GLIBCXX_DEBUG", "DEBUG_ALLOW_LOUD"}; + std::vector debug_defines_debug = {"_GLIBCXX_DEBUG", "DEBUG_JSON_ALLOW_LOUD"}; std::vector opt_flags_release = {"-g", "-O2"}; std::vector opt_flags_debug = {"-g", "-ggdb", "-O0"}; @@ -43,7 +43,7 @@ struct TestWebsiteBuildScript { std::vector ext_targets; std::vector my_targets; - { CTarget T("libjsonincpp", "shared_library"); + { CTarget T{"libjsonincpp", "shared_library"}; T.additional_compilation_flags = getSomeRadFlags(); T.units = { "utf8.cpp", @@ -70,13 +70,12 @@ struct TestWebsiteBuildScript { for (std::string& u: T.exported_headers) u = "libjsonincpp/" + u; T.installation_dir = ""; - T.description = "C++ JSON object structure + parser and generator"; T.pc_output_path = "libjsonincpp.pc"; my_targets.push_back(T); } - if (make_tests) { CTarget T("test0", "executable"); + if (make_tests) { CTarget T{"test0", "executable"}; T.additional_compilation_flags = getSomeRadFlags(); - T.proj_deps = {CTargetDependenceOnProjectsLibrary("libjsonincpp")}; + T.proj_deps = {CTargetDependenceOnProjectsLibrary{"libjsonincpp"}}; T.units = {"tests/test0.cpp"}; T.include_pr = "tests"; my_targets.push_back(T); @@ -88,7 +87,7 @@ struct TestWebsiteBuildScript { int main(int argc, char** argv) { try { - assert(argc > 0); + ASSERT_pl(argc > 0); std::vector args(argc - 1); for (int i = 0; i + 1 < argc; i++) { args[i] = argv[i + 1];