Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/project_parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ struct Target {
ConditionVector precompile_headers;
ConditionVector private_precompile_headers;

ConditionVector dependencies;

std::string condition;
std::string alias;
Condition<tsl::ordered_map<std::string, std::string>> properties;
Expand Down
10 changes: 6 additions & 4 deletions src/cmake_generator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
});
};

auto link_libraries = [&](const parser::ConditionVector &cargs, const std::string &scope) {
auto link_cmd = [&](const char *command, const parser::ConditionVector &cargs, const std::string &scope) {
gen.handle_condition(cargs, [&](const std::string &, const std::vector<std::string> &args) {
std::vector<std::string> targs;
for (const std::string &arg : args) {
Expand All @@ -1432,7 +1432,7 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
targs.push_back(arg);
}
}
cmd("target_link_libraries")(target.name, scope, targs);
cmd(command)(target.name, scope, targs);
});
};

Expand All @@ -1452,14 +1452,16 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
target_cmd("target_link_directories", t.link_directories, target_scope);
target_cmd("target_link_directories", t.private_link_directories, "PRIVATE");

link_libraries(t.link_libraries, target_scope);
link_libraries(t.private_link_libraries, "PRIVATE");
link_cmd("target_link_libraries", t.link_libraries, target_scope);
link_cmd("target_link_libraries", t.private_link_libraries, "PRIVATE");

target_cmd("target_link_options", t.link_options, target_scope);
target_cmd("target_link_options", t.private_link_options, "PRIVATE");

target_cmd("target_precompile_headers", t.precompile_headers, target_scope);
target_cmd("target_precompile_headers", t.private_precompile_headers, "PRIVATE");

link_cmd("add_dependencies", t.dependencies, "");
};

if (tmplate != nullptr) {
Expand Down
2 changes: 2 additions & 0 deletions src/project_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,8 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
t.optional("precompile-headers", target.precompile_headers);
t.optional("private-precompile-headers", target.private_precompile_headers);

t.optional("dependencies", target.dependencies);

Condition<std::string> msvc_runtime;
t.optional("msvc-runtime", msvc_runtime);
for (const auto &cond_itr : msvc_runtime) {
Expand Down