admin/build-cpp-cmkr
1
0
Fork 0
mirror of https://github.com/build-cpp/cmkr synced 2026-06-08 13:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements to property ordering

Browse Source
This commit is contained in:
Duncan Ogilvie
2021-03-25 11:22:42 +01:00
parent fdd9a3d134
commit 7828461a42
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmkrlib/cmake.cpp
+12 -10
View File
@@ -196,27 +196,29 @@ CMake::CMake(const std::string &path, bool build) {
#undef renamed
auto optional_array = [&t](const toml::key &k, std::vector<std::string> &v) {
auto optional_array = [&t](const toml::key &k) {
std::vector<std::string> v;
if (t.contains(k)) {
v = detail::to_string_vec(toml::find(t, k).as_array());
}
return v;
};
optional_array("compile-definitions", target.compile_definitions);
optional_array("compile-features", target.compile_features);
optional_array("compile-options", target.compile_options);
optional_array("include-directories", target.include_directories);
optional_array("link-directories", target.link_directories);
optional_array("link-libraries", target.link_libraries);
optional_array("link-options", target.link_options);
optional_array("precompile-headers", target.precompile_headers);
target.compile_definitions = optional_array("compile-definitions");
target.compile_features = optional_array("compile-features");
target.compile_options = optional_array("compile-options");
target.include_directories = optional_array("include-directories");
target.link_directories = optional_array("link-directories");
target.link_libraries = optional_array("link-libraries");
target.link_options = optional_array("link-options");
target.precompile_headers = optional_array("precompile-headers");
if (t.contains("alias")) {
target.alias = toml::find(t, "alias").as_string();
}
if (t.contains("properties")) {
using prop_map = std::map<std::string, std::string>;
using prop_map = tsl::ordered_map<std::string, std::string>;
target.properties = toml::find<prop_map>(t, "properties");
}
src/cmkrlib/cmake.hpp
+1 -1
View File
@@ -47,7 +47,7 @@ struct Target {
std::vector<std::string> sources;
std::string alias;
std::map<std::string, std::string> properties;
tsl::ordered_map<std::string, std::string> properties;
};
struct Test {
src/cmkrlib/gen.cpp
+1 -1
View File
@@ -158,7 +158,7 @@ struct Command {
}
template <class Key, class Value>
bool print_arg(const std::map<Key, Value> &map) {
bool print_arg(const tsl::ordered_map<Key, Value> &map) {
if (map.empty()) {
return true;
}