cmake-js - npm Package Compare versions

Comparing version 7.1.1 to 7.2.0

changelog.md

@@ -0,1 +1,8 @@
+v7.2.0 - 12/02/23
+==========
+
+- fix: `-DCMAKE_JS_VERSION=undefined` (#298)
+- fix: Only add build type to `CMAKE_LIBRARY_OUTPUT_DIRECTORY` if needed (#299)
+- feat: Forward extra arguments to CMake commands (#297)
+
 v7.1.1 - 15/12/22
@@ -2,0 +9,0 @@ ==========

lib/cMake.js

@@ -28,2 +28,3 @@ "use strict";
     this.cMakeOptions = this.options.cMakeOptions || {};
+    this.extraCMakeArgs = this.options.extraCMakeArgs || [];
     this.silent = !!options.silent;
@@ -129,3 +130,3 @@ }
     // CMake.js watermark
-    D.push({"CMAKE_JS_VERSION": environment.moduleVersion});
+    D.push({"CMAKE_JS_VERSION": environment.cmakeJsVersion});
 
@@ -135,12 +136,15 @@ // Build configuration:
     if (environment.isWin) {
-		D.push({"CMAKE_RUNTIME_OUTPUT_DIRECTORY": this.workDir});
-	}
-	else {
-		D.push({"CMAKE_LIBRARY_OUTPUT_DIRECTORY": this.buildDir});
-	}
-    
+        D.push({"CMAKE_RUNTIME_OUTPUT_DIRECTORY": this.workDir});
+    }
+    else if (this.workDir.endsWith(this.config)) {
+        D.push({"CMAKE_LIBRARY_OUTPUT_DIRECTORY": this.workDir});
+    }
+    else {
+        D.push({"CMAKE_LIBRARY_OUTPUT_DIRECTORY": this.buildDir});
+    }
+
     // In some configurations MD builds will crash upon attempting to free memory.
-    // This tries to encourage MT builds which are larger but less likely to have this crash. 
+    // This tries to encourage MT builds which are larger but less likely to have this crash.
     D.push({"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>"})
-    
+
     // Includes:
@@ -226,7 +230,7 @@ const includesString = await this.getCmakeJsIncludeString();
 
-    return command;
+    return command.concat(this.extraCMakeArgs);
 };
 
 CMake.prototype.getCmakeJsLibString = function () {
-    
+
     const libs = []
@@ -371,3 +375,3 @@ if (environment.isWin) {
     }
-    return Promise.resolve(command);
+    return Promise.resolve(command.concat(this.extraCMakeArgs));
 };
@@ -385,3 +389,3 @@
 CMake.prototype.getCleanCommand = function () {
-    return [this.path, "-E", "remove_directory", this.workDir];
+    return [this.path, "-E", "remove_directory", this.workDir].concat(this.extraCMakeArgs);
 };
@@ -397,2 +401,3 @@
 CMake.prototype.reconfigure = async function () {
+    this.extraCMakeArgs = [];
     await this.clean();
@@ -403,2 +408,3 @@ await this.configure();
 CMake.prototype.rebuild = async function () {
+    this.extraCMakeArgs = [];
     await this.clean();
@@ -409,2 +415,3 @@ await this.build();
 CMake.prototype.compile = async function () {
+    this.extraCMakeArgs = [];
     try {
@@ -411,0 +418,0 @@ await this.build();

package.json

@@ -24,3 +24,3 @@ {
   "main": "lib",
-  "version": "7.1.1",
+  "version": "7.2.0",
   "author": "Gábor Mező aka unbornchikken",
@@ -45,3 +45,3 @@ "maintainers": [
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.3.2",
     "debug": "^4",
@@ -51,3 +51,3 @@ "fs-extra": "^10.1.0",
     "memory-stream": "^1.0.0",
-    "node-api-headers": "^0.0.1",
+    "node-api-headers": "^0.0.2",
     "npmlog": "^6.0.2",
@@ -64,3 +64,3 @@ "rc": "^1.2.7",
     "nan": "^2.16.0",
-    "node-addon-api": "^5.0.0"
+    "node-addon-api": "^6.0.0"
   },
@@ -67,0 +67,0 @@ "scripts": {

No alert changes

Improved metrics

Total package byte prevSize

111911

increased by0.56%

Lines of code

1893

increased by0.37%

Dependency changes

• + Addedaxios@1.6.8(transitive)

• + Addednode-api-headers@0.0.2(transitive)

• + Addedproxy-from-env@1.1.0(transitive)

• - Removedaxios@0.27.2(transitive)

• - Removednode-api-headers@0.0.1(transitive)

• Updatedaxios@^1.3.2

• Updatednode-api-headers@^0.0.2