duplicate OPENCV_INCLUDE_DIR path if needed

UrielCh · Apr 16, 2024 · b995059 · b995059
1 parent becb7a8
commit b995059
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/install/compileLib.js b/install/compileLib.js
@@ -123,9 +123,23 @@ function getOPENCV4NODEJS_INCLUDES(env) {
     if (OPENCV_INCLUDE_DIR) {
         explicitIncludeDir = (0, commons_js_1.resolvePath)(OPENCV_INCLUDE_DIR);
     }
-    const includes = env.isAutoBuildDisabled
-        ? (explicitIncludeDir ? [explicitIncludeDir] : getDefaultIncludeDirs(env))
-        : [(0, commons_js_1.resolvePath)(env.opencvInclude), (0, commons_js_1.resolvePath)(env.opencv4Include)];
+    let includes = [];
+    if (env.isAutoBuildDisabled) {
+        if (explicitIncludeDir) {
+            if (explicitIncludeDir.endsWith('opencv4')) {
+                includes = [explicitIncludeDir, path.resolve(explicitIncludeDir, '..')];
+            }
+            else {
+                includes = [explicitIncludeDir, path.resolve(explicitIncludeDir, 'opencv4')];
+            }
+        }
+        else {
+            includes = getDefaultIncludeDirs(env);
+        }
+    }
+    else {
+        includes = [(0, commons_js_1.resolvePath)(env.opencvInclude), (0, commons_js_1.resolvePath)(env.opencv4Include)];
+    }
     log('info', 'install', `${os_1.EOL}Setting the following includes:`);
     includes.forEach(inc => log('info', 'includes', pc.green(inc)));
     return includes;

diff --git a/install/compileLib.ts b/install/compileLib.ts
@@ -130,9 +130,20 @@ function getOPENCV4NODEJS_INCLUDES(env: OpenCVBuildEnv): string[] {
     if (OPENCV_INCLUDE_DIR) {
         explicitIncludeDir = resolvePath(OPENCV_INCLUDE_DIR)
     }
-    const includes = env.isAutoBuildDisabled
-        ? (explicitIncludeDir ? [explicitIncludeDir] : getDefaultIncludeDirs(env))
-        : [resolvePath(env.opencvInclude), resolvePath(env.opencv4Include)]
+    let includes: string[] = [];
+    if (env.isAutoBuildDisabled) {
+        if (explicitIncludeDir) {
+            if (explicitIncludeDir.endsWith('opencv4')) {
+                includes = [explicitIncludeDir, path.resolve(explicitIncludeDir, '..')];
+            } else {
+                includes = [explicitIncludeDir, path.resolve(explicitIncludeDir, 'opencv4')];
+            }
+        } else {
+            includes = getDefaultIncludeDirs(env);
+        }
+    } else {
+        includes = [resolvePath(env.opencvInclude), resolvePath(env.opencv4Include)];
+    }
     log('info', 'install', `${EOL}Setting the following includes:`)
     includes.forEach(inc => log('info', 'includes', pc.green(inc)))
     return includes;