From 867a4568acfa563b9c4dd11e6680f870458488bf Mon Sep 17 00:00:00 2001 From: jgonzalez49 <68764159+jgonzalez49@users.noreply.github.com> Date: Fri, 14 Apr 2023 05:30:31 -0700 Subject: [PATCH 1/3] Corrected path and library for latest SDK as of 3.0.0.118 --- src/Spinnaker.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Spinnaker.jl b/src/Spinnaker.jl index 697451a..9e513c4 100644 --- a/src/Spinnaker.jl +++ b/src/Spinnaker.jl @@ -66,9 +66,9 @@ end # Create a System object at runtime function init() @static if Sys.iswindows() - paths = [joinpath(ENV["ProgramFiles"], "Point Grey Research", "Spinnaker", "bin", "vs2015")] + paths = [joinpath(ENV["ProgramFiles"], "FLIR Systems", "Spinnaker", "bin64", "vs2015")] libspinnaker = "SpinnakerC_v140.dll" - libspinvideo = "" + libspinvideo = "SpinVideoC_v140.dll" elseif Sys.islinux() paths = ["/usr/lib" "/opt/spinnaker/lib"] libspinnaker = "libSpinnaker_C.so" From ab4803b9b7c23f986190dd0bed4f988ab4899b09 Mon Sep 17 00:00:00 2001 From: jgonzalez49 <68764159+jgonzalez49@users.noreply.github.com> Date: Fri, 14 Apr 2023 14:06:55 -0700 Subject: [PATCH 2/3] Made it backwards compatible with old path for SDK --- src/Spinnaker.jl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Spinnaker.jl b/src/Spinnaker.jl index 9e513c4..f61d5fa 100644 --- a/src/Spinnaker.jl +++ b/src/Spinnaker.jl @@ -66,7 +66,11 @@ end # Create a System object at runtime function init() @static if Sys.iswindows() - paths = [joinpath(ENV["ProgramFiles"], "FLIR Systems", "Spinnaker", "bin64", "vs2015")] + if isdir(joinpath(ENV["ProgramFiles"], "Point Grey Research", "Spinnaker", "bin", "vs2015")) + paths = [joinpath(ENV["ProgramFiles"], "Point Grey Research", "Spinnaker", "bin", "vs2015")] + elseif isdir(joinpath(ENV["ProgramFiles"], "FLIR Systems", "Spinnaker", "bin64", "vs2015")) + paths = [joinpath(ENV["ProgramFiles"], "FLIR Systems", "Spinnaker", "bin64", "vs2015")] + end libspinnaker = "SpinnakerC_v140.dll" libspinvideo = "SpinVideoC_v140.dll" elseif Sys.islinux() From baee7f1e3ded85de3c2abe88c388833051fa1f87 Mon Sep 17 00:00:00 2001 From: Jeremias Gonzalez Date: Fri, 5 Jul 2024 15:24:58 -0700 Subject: [PATCH 3/3] Add support for new Windows path Added check for new Windows path structure. --- src/Spinnaker.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Spinnaker.jl b/src/Spinnaker.jl index f61d5fa..66e0f5b 100644 --- a/src/Spinnaker.jl +++ b/src/Spinnaker.jl @@ -70,6 +70,8 @@ function init() paths = [joinpath(ENV["ProgramFiles"], "Point Grey Research", "Spinnaker", "bin", "vs2015")] elseif isdir(joinpath(ENV["ProgramFiles"], "FLIR Systems", "Spinnaker", "bin64", "vs2015")) paths = [joinpath(ENV["ProgramFiles"], "FLIR Systems", "Spinnaker", "bin64", "vs2015")] + elseif isdir(joinpath(ENV["ProgramFiles"], "Teledyne", "Spinnaker", "bin64", "vs2015")) + paths = [joinpath(ENV["ProgramFiles"], "Teledyne", "Spinnaker", "bin64", "vs2015")] end libspinnaker = "SpinnakerC_v140.dll" libspinvideo = "SpinVideoC_v140.dll"