Merge pull request #28 from build-cpp/conditional-properties

Implement conditional properties
toml-checker
Duncan Ogilvie 3 years ago committed by GitHub
commit 8ea5b77ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,7 +2,7 @@ include_guard()
# Change these defaults to point to your infrastructure if desired # Change these defaults to point to your infrastructure if desired
set(CMKR_REPO "https://github.com/build-cpp/cmkr" CACHE STRING "cmkr git repository" FORCE) set(CMKR_REPO "https://github.com/build-cpp/cmkr" CACHE STRING "cmkr git repository" FORCE)
set(CMKR_TAG "archive_af3807ca" CACHE STRING "cmkr git tag (this needs to be available forever)" FORCE) set(CMKR_TAG "archive_2450cfb2" CACHE STRING "cmkr git tag (this needs to be available forever)" FORCE)
# Set these from the command line to customize for development/debugging purposes # Set these from the command line to customize for development/debugging purposes
set(CMKR_EXECUTABLE "" CACHE FILEPATH "cmkr executable") set(CMKR_EXECUTABLE "" CACHE FILEPATH "cmkr executable")

@ -85,7 +85,7 @@ struct Target {
ConditionVector private_precompile_headers; ConditionVector private_precompile_headers;
std::string alias; std::string alias;
tsl::ordered_map<std::string, std::string> properties; Condition<tsl::ordered_map<std::string, std::string>> properties;
Condition<std::string> cmake_before; Condition<std::string> cmake_before;
Condition<std::string> cmake_after; Condition<std::string> cmake_after;

@ -219,19 +219,33 @@ CMake::CMake(const std::string &path, bool build) {
} }
if (t.contains("properties")) { if (t.contains("properties")) {
const auto &props = toml::find(t, "properties").as_table(); auto store_property = [&target](const toml::key &k, const TomlBasicValue &v, const std::string &condition) {
for (const auto &propKv : props) { if (v.is_array()) {
if (propKv.second.is_array()) {
std::string property_list; std::string property_list;
for (const auto &list_val : propKv.second.as_array()) { for (const auto &list_val : v.as_array()) {
if (!property_list.empty()) { if (!property_list.empty()) {
property_list += ';'; property_list += ';';
} }
property_list += list_val.as_string(); property_list += list_val.as_string();
} }
target.properties[propKv.first] = property_list; target.properties[condition][k] = property_list;
} else if (v.is_boolean()) {
target.properties[condition][k] = v.as_boolean() ? "ON" : "OFF";
} else {
target.properties[condition][k] = v.as_string();
}
};
const auto &props = toml::find(t, "properties").as_table();
for (const auto &propKv : props) {
const auto &k = propKv.first;
const auto &v = propKv.second;
if (v.is_table()) {
for (const auto &condKv : v.as_table()) {
store_property(condKv.first, condKv.second, k);
}
} else { } else {
target.properties[propKv.first] = propKv.second.as_string(); store_property(k, v, "");
} }
} }
} }

@ -780,7 +780,9 @@ int generate_cmake(const char *path, bool root) {
target_cmd("target_precompile_headers", target.private_precompile_headers, "PRIVATE"); target_cmd("target_precompile_headers", target.private_precompile_headers, "PRIVATE");
if (!target.properties.empty()) { if (!target.properties.empty()) {
cmd("set_target_properties")(target.name, "PROPERTIES", target.properties).endl(); gen.handle_condition(target.properties, [&](const std::string &, const tsl::ordered_map<std::string, std::string> &properties) {
cmd("set_target_properties")(target.name, "PROPERTIES", properties);
});
} }
gen.handle_condition(target.include_after, gen.handle_condition(target.include_after,

@ -14,4 +14,10 @@ windows.cmake-after = "message(STATUS win32-after)"
macos.cmake-after = "message(STATUS macos-after)" macos.cmake-after = "message(STATUS macos-after)"
linux.cmake-after = "message(STATUS linux-after)" linux.cmake-after = "message(STATUS linux-after)"
unix.cmake-after = "message(STATUS unix-after)" unix.cmake-after = "message(STATUS unix-after)"
custom.cmake-after = "message(STATUS custom-after)" custom.cmake-after = "message(STATUS custom-after)"
[target.example.properties]
AUTOMOC = false
custom.OUTPUT_NAME = "example2"
custom.AUTORCC = true
AUTOGEN = "ON"
Loading…
Cancel
Save