From de03021a06886dcc5f364b2d8e3bc0348b898d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= <kraen.hansen@mongodb.com>
Date: Wed, 21 May 2025 11:25:04 +0200
Subject: [PATCH 1/2] Add test for command expansion

---
 packages/gyp-to-cmake/src/transformer.test.ts | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/gyp-to-cmake/src/transformer.test.ts b/packages/gyp-to-cmake/src/transformer.test.ts
index 47975995..f59fca5f 100644
--- a/packages/gyp-to-cmake/src/transformer.test.ts
+++ b/packages/gyp-to-cmake/src/transformer.test.ts
@@ -48,4 +48,39 @@ describe("bindingGypToCmakeLists", () => {
 
     assert(output.includes("add_library(foo SHARED file\\ with\\ spaces.cc"));
   });
+
+  describe("command expansions", () => {
+    it("should expand", () => {
+      const output = bindingGypToCmakeLists({
+        projectName: "some-project",
+        gyp: {
+          targets: [
+            {
+              target_name: "foo",
+              sources: ["<!echo bar baz"],
+            },
+          ],
+        },
+      });
+
+      // Adding \ between bar and baz, as we expect the "bar baz" to be handled like a path with spaces
+      assert(output.includes("add_library(foo SHARED bar\\ baz"));
+    });
+
+    it("should expand into lists when prefixed with '@'", () => {
+      const output = bindingGypToCmakeLists({
+        projectName: "some-project",
+        gyp: {
+          targets: [
+            {
+              target_name: "foo",
+              sources: ["<!@echo bar baz"],
+            },
+          ],
+        },
+      });
+
+      assert(output.includes("add_library(foo SHARED bar baz"));
+    });
+  });
 });

From 1131c0381e1f55aea1569457b31da23718734f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= <kraen.hansen@mongodb.com>
Date: Wed, 21 May 2025 11:44:34 +0200
Subject: [PATCH 2/2] Emit "defines" via target_compile_definitions

---
 packages/gyp-to-cmake/src/gyp.ts              |  1 +
 packages/gyp-to-cmake/src/transformer.test.ts | 24 +++++++++++++++++++
 packages/gyp-to-cmake/src/transformer.ts      | 22 ++++++++++++-----
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/packages/gyp-to-cmake/src/gyp.ts b/packages/gyp-to-cmake/src/gyp.ts
index cdde0d75..fdd209ef 100644
--- a/packages/gyp-to-cmake/src/gyp.ts
+++ b/packages/gyp-to-cmake/src/gyp.ts
@@ -7,6 +7,7 @@ export type GypTarget = {
   target_name: string;
   sources: string[];
   include_dirs?: string[];
+  defines?: string[];
 };
 
 export type GypBinding = {
diff --git a/packages/gyp-to-cmake/src/transformer.test.ts b/packages/gyp-to-cmake/src/transformer.test.ts
index f59fca5f..ba3de13f 100644
--- a/packages/gyp-to-cmake/src/transformer.test.ts
+++ b/packages/gyp-to-cmake/src/transformer.test.ts
@@ -83,4 +83,28 @@ describe("bindingGypToCmakeLists", () => {
       assert(output.includes("add_library(foo SHARED bar baz"));
     });
   });
+
+  describe("defines", () => {
+    it("should add defines as target-specific compile definitions", () => {
+      const output = bindingGypToCmakeLists({
+        projectName: "some-project",
+        gyp: {
+          targets: [
+            {
+              target_name: "foo",
+              sources: ["foo.cc"],
+              defines: ["FOO", "BAR=value"],
+            },
+          ],
+        },
+      });
+
+      assert(
+        output.includes(
+          "target_compile_definitions(foo PRIVATE FOO BAR=value)"
+        ),
+        `Expected output to include target_compile_definitions:\n${output}`
+      );
+    });
+  });
 });
diff --git a/packages/gyp-to-cmake/src/transformer.ts b/packages/gyp-to-cmake/src/transformer.ts
index aa1b5e6f..ca2d45b4 100644
--- a/packages/gyp-to-cmake/src/transformer.ts
+++ b/packages/gyp-to-cmake/src/transformer.ts
@@ -17,7 +17,7 @@ function isCmdExpansion(value: string) {
   return trimmedValue.startsWith("<!");
 }
 
-function escapePath(source: string) {
+function escapeSpaces(source: string) {
   return source.replace(/ /g, "\\ ");
 }
 
@@ -54,25 +54,30 @@ export function bindingGypToCmakeLists({
     //"cmake_policy(SET CMP0042 NEW)",
     `project(${projectName})`,
     "",
-    `add_compile_definitions(-DNAPI_VERSION=${napiVersion})`,
+    // Declaring a project-wide NAPI_VERSION as a fallback for targets that don't explicitly set it
+    `add_compile_definitions(NAPI_VERSION=${napiVersion})`,
   ];
 
   for (const target of gyp.targets) {
     const { target_name: targetName } = target;
 
     // TODO: Handle "conditions"
-    // TODO: Handle "defines"
     // TODO: Handle "cflags"
     // TODO: Handle "ldflags"
 
     const escapedJoinedSources = target.sources
       .flatMap(mapExpansion)
-      .map(escapePath)
+      .map(escapeSpaces)
       .join(" ");
 
     const escapedJoinedIncludes = (target.include_dirs || [])
       .flatMap(mapExpansion)
-      .map(escapePath)
+      .map(escapeSpaces)
+      .join(" ");
+
+    const escapedJoinedDefines = (target.defines || [])
+      .flatMap(mapExpansion)
+      .map(escapeSpaces)
       .join(" ");
 
     lines.push(
@@ -81,7 +86,12 @@ export function bindingGypToCmakeLists({
       `set_target_properties(${targetName} PROPERTIES PREFIX "" SUFFIX ".node")`,
       `target_include_directories(${targetName} PRIVATE ${escapedJoinedIncludes} \${CMAKE_JS_INC})`,
       `target_link_libraries(${targetName} PRIVATE \${CMAKE_JS_LIB})`,
-      `target_compile_features(${targetName} PRIVATE cxx_std_17)`
+      `target_compile_features(${targetName} PRIVATE cxx_std_17)`,
+      ...(escapedJoinedDefines
+        ? [
+            `target_compile_definitions(${targetName} PRIVATE ${escapedJoinedDefines})`,
+          ]
+        : [])
       // or
       // `set_target_properties(${targetName} PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS NO)`,
     );