Spinnaker: Unattended Spinnaker installation location on Windows is "…

…C:/Program Files/Spinnaker" so consider it as an alternate
jpsacha · Aug 4, 2024 · 09a0c52 · 09a0c52
1 parent 34a30f5
commit 09a0c52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/spinnaker/cppbuild.sh b/spinnaker/cppbuild.sh
@@ -29,11 +29,10 @@ case $PLATFORM in
         fi
         ;;
     windows-*)
-        if [[ ! -d "/C/Program Files/Teledyne/Spinnaker/" ]]; then
+        if [[ ! -d "/C/Program Files/Teledyne/Spinnaker/" ]] && [[ ! -d "/C/Program Files/Spinnaker/" ]]; then
             echo "Please install Spinnaker under the default installation directory"
-            ls "/C"
-            ls "/C/Program Files"
-            ls "/C/Program Files/Teledyne"
+            echo "Content of C:/Program Files"
+            ls -l "/C/Program Files"
             exit 1
         fi
         ;;

diff --git a/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java b/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java
@@ -62,10 +62,13 @@
                 includepath = {"/opt/spinnaker/include/spinc/",
                                "/usr/include/spinnaker/spinc/"}),
         @Platform(value = "windows", link = {"SpinnakerC_v140", "Spinnaker_v140", "SpinVideoC_v140", "SpinVideo_v140"},
-                includepath = {"C:/Program Files/Teledyne/Spinnaker/include/spinc/"}),
+                includepath = {"C:/Program Files/Teledyne/Spinnaker/include/spinc/",
+                               "C:/Program Files/Spinnaker/include/spinc/"}),
         @Platform(value = "windows-x86_64",
-                linkpath    = {"C:/Program Files/Teledyne/Spinnaker/lib64/vs2015/"},
-                preloadpath = {"C:/Program Files/Teledyne/Spinnaker/lib64/vs2015/"})})
+                linkpath    = {"C:/Program Files/Teledyne/Spinnaker/lib64/vs2015/",
+                               "C:/Program Files/Spinnaker/lib64/vs2015/"},
+                preloadpath = {"C:/Program Files/Teledyne/Spinnaker/lib64/vs2015/",
+                               "C:/Program Files/Spinnaker/lib64/vs2015/"})})
 public class Spinnaker_C implements InfoMapper {
     static { Loader.checkVersion("org.bytedeco", "spinnaker"); }