Address latest custom command review feedback

Author: mrexodia

docs/cmake-toml.md

@@ -273,7 +273,7 @@ comment = "Run custom target"
 job-pool = "pool"
 job-server-aware = true
 verbatim = true
-uses-terminal = true
+uses-terminal = false # incompatible with job-pool when true
 command-expand-lists = true
 
 cmake-before = """
@@ -314,7 +314,7 @@ implicit-depends = [["CXX", "src/input.idl"]]
 working-directory = "${CMAKE_CURRENT_BINARY_DIR}"
 comment = "Generate source"
 depfile = "${CMAKE_CURRENT_BINARY_DIR}/generated.d"
-job-pool = "pool"
+job-pool = "pool" # incompatible with uses-terminal when uses-terminal = true
 job-server-aware = true
 verbatim = true
 append = false
@@ -335,7 +335,7 @@ command-expand-lists = false
 uses-terminal = false
 ```
 
-For each custom command entry, exactly one of `outputs` or `build-event` is required. Relative `outputs`/`byproducts` paths follow CMake and are interpreted from the current binary directory. `build-event` is only valid for non-`interface` targets, and `pre-link` is not supported for `type = "custom"`.
+For each custom command entry, exactly one of `outputs` or `build-event` is required. Relative `outputs`/`byproducts` paths follow CMake and are interpreted from the current binary directory. `build-event` is only valid for non-`interface` targets, and `pre-link` is not supported for `type = "custom"`. In both `add_custom_command(OUTPUT ...)` and `add_custom_target(...)`, `job-pool` cannot be combined with `uses-terminal = true`.
 
 A table mapping the cmkr features to the relevant CMake construct and the relevant documentation pages:
 

docs/examples/generator-executable.md

@@ -48,6 +48,11 @@ type = "executable"
 sources = ["src/main.cpp"]
 include-directories = ["${CMAKE_CURRENT_BINARY_DIR}/generated"]
 
+# Create the generated directory before the generator runs.
+cmake-before = """
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated")
+"""
+
 # Output form custom command: runs the generate_numbers executable to generate sources.
 # The outputs are automatically added as sources to this target.
 # The DEPENDS on "generate_numbers" ensures the generator is built before this runs.

src/cmake_generator.cpp

@@ -1331,6 +1331,11 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
             }
             custom_commands.insert(custom_commands.end(), target.custom_commands.begin(), target.custom_commands.end());
 
+            if (resolved_target_type == parser::target_custom && custom_target.has_job_pool && custom_target.has_uses_terminal &&
+                custom_target.uses_terminal) {
+                throw_target_error("job-pool cannot be used with uses-terminal");
+            }
+
             auto normalize_generated_output_source = [](const std::string &output) {
                 auto starts_with = [](const std::string &value, const std::string &prefix) {
                     return value.rfind(prefix, 0) == 0;

src/project_parser.cpp

@@ -1016,6 +1016,9 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
                     if (custom_command.has_depfile && !custom_command.implicit_depends.empty()) {
                         throw_key_error("depfile cannot be used with implicit-depends", "depfile", custom.find("depfile"));
                     }
+                    if (custom_command.has_job_pool && custom_command.has_uses_terminal && custom_command.uses_terminal) {
+                        throw_key_error("job-pool cannot be used with uses-terminal", "job-pool", custom.find("job-pool"));
+                    }
                     if (custom_command.append &&
                         (custom_command.has_depfile || custom_command.has_job_pool || custom_command.has_job_server_aware ||
                          custom_command.has_codegen || custom_command.has_command_expand_lists || custom_command.has_uses_terminal ||
@@ -1034,6 +1037,11 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
             }
         }
 
+        if (resolved_target_type == target_custom && target.custom_target.has_job_pool && target.custom_target.has_uses_terminal &&
+            target.custom_target.uses_terminal) {
+            throw_key_error("job-pool cannot be used with uses-terminal", "job-pool", t.find("job-pool"));
+        }
+
         if (resolved_target_type != target_custom && !target.custom_target.empty()) {
             const char *custom_key = "all";
             if (target.custom_target.has_command) {

tests/generator-executable/cmake.toml

@@ -33,6 +33,11 @@ type = "executable"
 sources = ["src/main.cpp"]
 include-directories = ["${CMAKE_CURRENT_BINARY_DIR}/generated"]
 
+# Create the generated directory before the generator runs.
+cmake-before = """
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated")
+"""
+
 # Output form custom command: runs the generate_numbers executable to generate sources.
 # The outputs are automatically added as sources to this target.
 # The DEPENDS on "generate_numbers" ensures the generator is built before this runs.

tests/generator-executable/src/generate_numbers.cpp

@@ -13,12 +13,7 @@ int main(int argc, char *argv[]) {
 
     std::string output_path = argv[1];
 
-    // Create output directory if needed
-    auto last_slash = output_path.find_last_of("/\\");
-    if (last_slash != std::string::npos) {
-        // Note: In a real generator, you'd create the directory
-        // CMake creates it for us when using add_custom_command
-    }
+    // The example ensures the output directory exists before invoking the generator.
 
     std::ofstream out(output_path);
     if (!out) {