Add support for target condition

Implement conditional properties

CMakeLists.txt

@@ -71,6 +71,7 @@ generate_documentation()
 
 unset(CMKR_TARGET)
 unset(CMKR_SOURCES)
+
 # Target cmkr
 set(CMKR_TARGET cmkr)
 set(cmkr_SOURCES "")
@@ -130,6 +131,7 @@ target_link_libraries(cmkr PRIVATE
 
 unset(CMKR_TARGET)
 unset(CMKR_SOURCES)
+
 install(
 	TARGETS
 		cmkr

cmake/cmkr.cmake

@@ -2,7 +2,7 @@ include_guard()
 
 # 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_TAG "archive_5ad6134e" 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(CMKR_EXECUTABLE "" CACHE FILEPATH "cmkr executable")

include/cmake.hpp

@@ -84,8 +84,9 @@ struct Target {
     ConditionVector precompile_headers;
     ConditionVector private_precompile_headers;
 
+    std::string condition;
     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_after;

src/cmake.cpp

@@ -214,24 +214,42 @@ CMake::CMake(const std::string &path, bool build) {
                     sources.insert(sources.end(), headers.begin(), headers.end());
                 }
 
+                if (t.contains("condition")) {
+                    target.condition = toml::find(t, "condition").as_string();
+                }
+
                 if (t.contains("alias")) {
                     target.alias = toml::find(t, "alias").as_string();
                 }
 
                 if (t.contains("properties")) {
-                    const auto &props = toml::find(t, "properties").as_table();
-                    for (const auto &propKv : props) {
-                        if (propKv.second.is_array()) {
+                    auto store_property = [&target](const toml::key &k, const TomlBasicValue &v, const std::string &condition) {
+                        if (v.is_array()) {
                             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()) {
                                     property_list += ';';
                                 }
                                 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[propKv.first] = propKv.second.as_string();
+                            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 {
+                            store_property(k, v, "");
                         }
                     }
                 }

src/gen.cpp

@@ -158,8 +158,10 @@ struct Command {
     bool first_arg = true;
     bool had_newline = false;
     bool generated = false;
+    std::string post_comment;
 
-    Command(std::stringstream &ss, int depth, const std::string &command) : ss(ss), depth(depth), command(command) {}
+    Command(std::stringstream &ss, int depth, std::string command, std::string post_comment)
+        : ss(ss), depth(depth), command(std::move(command)), post_comment(std::move(post_comment)) {}
 
     ~Command() {
         if (!generated) {
@@ -303,7 +305,11 @@ struct Command {
         (void)std::initializer_list<bool>{print_arg(values)...};
         if (had_newline)
             ss << '\n' << indent(depth);
-        ss << ")\n";
+        ss << ")";
+        if (!post_comment.empty()) {
+            ss << " # " << post_comment;
+        }
+        ss << "\n";
         return CommandEndl(ss);
     }
 };
@@ -326,18 +332,18 @@ struct Generator {
     std::stringstream ss;
     int indent = 0;
 
-    Command cmd(const std::string &command) {
+    Command cmd(const std::string &command, const std::string &post_comment = "") {
         if (command.empty())
             throw std::invalid_argument("command cannot be empty");
         if (command == "if") {
             indent++;
-            return Command(ss, indent - 1, command);
+            return Command(ss, indent - 1, command, post_comment);
         } else if (command == "else" || command == "elseif") {
-            return Command(ss, indent - 1, command);
+            return Command(ss, indent - 1, command, post_comment);
         } else if (command == "endif") {
             indent--;
         }
-        return Command(ss, indent, command);
+        return Command(ss, indent, command, post_comment);
     }
 
     CommandEndl comment(const std::string &comment) {
@@ -390,7 +396,7 @@ struct Generator {
                         // TODO: somehow print line number information here?
                         throw std::runtime_error("Unknown condition '" + condition + "'");
                     }
-                    cmd("if")(RawArg(cmake.conditions[condition]));
+                    cmd("if", condition)(RawArg(cmake.conditions[condition]));
                 }
 
                 if (!itr.second.empty()) {
@@ -441,7 +447,7 @@ int generate_cmake(const char *path, bool root) {
 
     // Helper lambdas for more convenient CMake generation
     auto &ss = gen.ss;
-    auto cmd = [&gen](const std::string &comment) { return gen.cmd(comment); };
+    auto cmd = [&gen](const std::string &command) { return gen.cmd(command); };
     auto comment = [&gen](const std::string &comment) { return gen.comment(comment); };
     auto endl = [&gen]() { gen.endl(); };
     auto inject_includes = [&gen](const std::vector<std::string> &includes) { gen.inject_includes(includes); };
@@ -657,6 +663,15 @@ int generate_cmake(const char *path, bool root) {
     if (!cmake.targets.empty()) {
         for (const auto &target : cmake.targets) {
             comment("Target " + target.name);
+
+            if (!target.condition.empty()) {
+                const auto &condition = target.condition;
+                if (cmake.conditions.count(condition) == 0) {
+                    throw std::runtime_error("Unknown condition '" + condition + "' for [target." + target.name + "]");
+                }
+                gen.cmd("if", condition)(RawArg(cmake.conditions[condition]));
+            }
+
             cmd("set")("CMKR_TARGET", target.name);
 
             gen.handle_condition(target.include_before,
@@ -780,7 +795,9 @@ int generate_cmake(const char *path, bool root) {
             target_cmd("target_precompile_headers", target.private_precompile_headers, "PRIVATE");
 
             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,
@@ -789,6 +806,11 @@ int generate_cmake(const char *path, bool root) {
 
             cmd("unset")("CMKR_TARGET");
             cmd("unset")("CMKR_SOURCES");
+
+            if (!target.condition.empty()) {
+                cmd("endif")();
+            }
+
             endl();
         }
     }

tests/conditions/cmake.toml

@@ -14,4 +14,10 @@ windows.cmake-after = "message(STATUS win32-after)"
 macos.cmake-after = "message(STATUS macos-after)"
 linux.cmake-after = "message(STATUS linux-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"