collarbone-annihilation/libjsonincpp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor update to sync up with bs changes

Browse Source
This commit is contained in:
Андреев Григорий 2024-08-03 22:54:01 +03:00
parent dfbf0b2028
commit f37daf3494
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
building/main.cpp
View File

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