Pass configuration at the correct time (config vs build)

Author: kraenhansen

packages/cmake-rn/src/cli.ts

@@ -241,7 +241,6 @@ function getTargetsSummary(
 }
 
 function getBuildPath({ build, source }: BaseOpts) {
-  // TODO: Add configuration (debug vs release)
   return path.resolve(process.cwd(), build || path.join(source, "build"));
 }
 
@@ -250,6 +249,7 @@ function getBuildPath({ build, source }: BaseOpts) {
  */
 function getTargetBuildPath(buildPath: string, target: unknown) {
   assert(typeof target === "string", "Expected target to be a string");
+  // TODO: Add configuration (debug vs release) for platforms using single-config CMake generators
   return path.join(buildPath, target.replace(/;/g, "_"));
 }
 
@@ -286,17 +286,10 @@ async function buildProject<T extends string>(
   options: BaseOpts,
 ) {
   const { target, buildPath } = context;
-  const { verbose, configuration } = options;
+  const { verbose } = options;
   await spawn(
     "cmake",
-    [
-      "--build",
-      buildPath,
-      "--config",
-      configuration,
-      "--",
-      ...platform.buildArgs(context, options),
-    ],
+    ["--build", buildPath, ...platform.buildArgs(context, options)],
     {
       outputMode: verbose ? "inherit" : "buffered",
       outputPrefix: verbose ? chalk.dim(`[${target}] `) : undefined,

packages/cmake-rn/src/platforms/android.ts

@@ -74,7 +74,7 @@ export const platform: Platform<Target[], AndroidOpts> = {
   },
   configureArgs(
     { target },
-    { ndkVersion, androidSdkVersion, weakNodeApiLinkage },
+    { configuration, ndkVersion, androidSdkVersion, weakNodeApiLinkage },
   ) {
     const { ANDROID_HOME } = process.env;
     assert(
@@ -107,7 +107,7 @@ export const platform: Platform<Target[], AndroidOpts> = {
       ...toDeclarationArguments({
         CMAKE_SYSTEM_NAME: "Android",
         CMAKE_MAKE_PROGRAM: "ninja",
-        // "CMAKE_BUILD_TYPE": configuration,
+        CMAKE_BUILD_TYPE: configuration,
         // "CMAKE_C_COMPILER_LAUNCHER": "ccache",
         // "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
         ANDROID_NDK: ndkPath,

packages/cmake-rn/src/platforms/apple.ts

@@ -138,9 +138,14 @@ export const platform: Platform<Target[], AppleOpts> = {
       }),
     ];
   },
-  buildArgs() {
-    // We expect the final application to sign these binaries
-    return ["CODE_SIGNING_ALLOWED=NO"];
+  buildArgs(context, { configuration }) {
+    return [
+      "--config",
+      configuration,
+      "--",
+      // We expect the final application to sign these binaries
+      "CODE_SIGNING_ALLOWED=NO",
+    ];
   },
   isSupportedByHost: function (): boolean | Promise<boolean> {
     return process.platform === "darwin";