From 6c1a03648795b23c6d295009b9225b99f9a37640 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Tue, 11 Jul 2023 13:00:04 +0100 Subject: [PATCH 01/13] Code related to implementation of new device (DAQMMFCombinedVideo) --- CMakeLists.txt | 7 +++++++ SuperBuild/External_PlusLib.cmake | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ca6358bd..ea36b04d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,6 +235,13 @@ OPTION(PLUS_USE_INFRARED_TEQ1_CAM "Provide support for capturing an Infrared The OPTION(PLUS_USE_INFRARED_TEEV2_CAM "Provide support for capturing an Infrared Therma Expert EV2 Camera capture stream" OFF) OPTION(PLUS_USE_ULTRAVIOLET_PCOUV_CAM "Provide support for capturing an PCO Ultraviolet Camera capture stream" OFF) OPTION(PLUS_USE_DAQVIDEOSOURCE "Provide support for capturing an CameraLink Camera using DAQ System USB3-FRM13-B Grabber" OFF) +OPTION(PLUS_USE_DAQMMFCOMBINED_VIDEO "Provide support for capturing an CameraLink Camera using DAQ System USB3-FRM13-B Grabber and MMF Camera" OFF) + +IF(PLUS_USE_DAQMMFCOMBINED_VIDEO) + SET (PLUS_USE_DAQVIDEOSOURCE ON CACHE BOOL "Provide support for the DAQ System USB3-FRM13-B + MMF combined device" FORCE) + SET (PLUS_USE_MMF_VIDEO ON CACHE BOOL "Provide support for the DAQ System USB3-FRM13-B + MMF combined device" FORCE) +ENDIF() + OPTION(PLUS_USE_PHILIPS_3D_ULTRASOUND "Provide support for the Philips ie33 3D ultrasound probe" OFF) IF(PLUS_USE_PHILIPS_3D_ULTRASOUND) OPTION(PLUS_TEST_PHILIPS_3D_ULTRASOUND "Enable testing of acquisition from Philips 3D ultrasound systems. Enable this only if a Philips device is accessible from this computer. " OFF) diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index 17c27084c..43bf2e764 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -303,7 +303,9 @@ IF(PLUS_USE_DAQVIDEOSOURCE) -DDAQVIDEOSOURCE_SDK_DIR:PATH=${DAQVIDEOSOURCE_SDK_DIR} ) ENDIF() - +### PLUS_USE_DAQMMFCOMBINED_VIDEO is virtual. ARGS from DAQVideoSource and MMF_Video. +### IF(PLUS_USE_DAQMMFCOMBINED_VIDEO) +### ENDIF() IF(PLUS_USE_INTELREALSENSE) LIST(APPEND PLUSBUILD_ADDITIONAL_SDK_ARGS @@ -571,6 +573,7 @@ ExternalProject_Add(PlusLib -DPLUS_USE_INFRARED_TEEV2_CAM:BOOL=${PLUS_USE_INFRARED_TEEV2_CAM} -DPLUS_USE_ULTRAVIOLET_PCOUV_CAM:BOOL=${PLUS_USE_ULTRAVIOLET_PCOUV_CAM} -DPLUS_USE_DAQVIDEOSOURCE:BOOL=${PLUS_USE_DAQVIDEOSOURCE} + -DPLUS_USE_DAQMMFVIDEOSOURCE:BOOL=${PLUS_USE_DAQMMFVIDEOSOURCE} -DPLUS_USE_ATRACSYS:BOOL=${PLUS_USE_ATRACSYS} -DPLUS_USE_PICOSCOPE:BOOL=${PLUS_USE_PICOSCOPE} -DPLUS_USE_WITMOTIONTRACKER:BOOL=${PLUS_USE_WITMOTIONTRACKER} From f4a6985d394b222c4ff61609291ce6152bdcfefb Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Wed, 12 Jul 2023 14:27:09 +0100 Subject: [PATCH 02/13] Implementation of DAQMMFCombinedVideo --- SuperBuild/External_PlusLib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index 43bf2e764..6ba6e2dfd 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -573,7 +573,7 @@ ExternalProject_Add(PlusLib -DPLUS_USE_INFRARED_TEEV2_CAM:BOOL=${PLUS_USE_INFRARED_TEEV2_CAM} -DPLUS_USE_ULTRAVIOLET_PCOUV_CAM:BOOL=${PLUS_USE_ULTRAVIOLET_PCOUV_CAM} -DPLUS_USE_DAQVIDEOSOURCE:BOOL=${PLUS_USE_DAQVIDEOSOURCE} - -DPLUS_USE_DAQMMFVIDEOSOURCE:BOOL=${PLUS_USE_DAQMMFVIDEOSOURCE} + -DPLUS_USE_DAQMMFCOMBINED_VIDEO:BOOL=${PLUS_USE_DAQMMFCOMBINED_VIDEO} -DPLUS_USE_ATRACSYS:BOOL=${PLUS_USE_ATRACSYS} -DPLUS_USE_PICOSCOPE:BOOL=${PLUS_USE_PICOSCOPE} -DPLUS_USE_WITMOTIONTRACKER:BOOL=${PLUS_USE_WITMOTIONTRACKER} From 05f2083c9e84492e605ed2664c3bcb5f669c8b41 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Fri, 8 Dec 2023 13:26:49 +0000 Subject: [PATCH 03/13] =?UTF-8?q?Incorporaci=C3=B3n=20de=20C=C3=B3digo=20d?= =?UTF-8?q?e=20FLIR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 ++++ Modules/FindFLIRSpinnakerSDK.cmake | 70 ++++++++++++++++++++++++++++++ SuperBuild/External_PlusLib.cmake | 11 +++++ 3 files changed, 89 insertions(+) create mode 100644 Modules/FindFLIRSpinnakerSDK.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 95e9edc82..1ed63d7eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,6 +236,7 @@ OPTION(PLUS_USE_INFRARED_TEEV2_CAM "Provide support for capturing an Infrared Th OPTION(PLUS_USE_ULTRAVIOLET_PCOUV_CAM "Provide support for capturing an PCO Ultraviolet Camera capture stream" OFF) OPTION(PLUS_USE_DAQVIDEOSOURCE "Provide support for capturing an CameraLink Camera using DAQ System USB3-FRM13-B Grabber" OFF) OPTION(PLUS_USE_DAQMMFCOMBINED_VIDEO "Provide support for capturing an CameraLink Camera using DAQ System USB3-FRM13-B Grabber and MMF Camera" OFF) +OPTION(PLUS_USE_FLIRSPINNAKER_CAM "Provide support for capturing an FLIR Spinnaker capture stream" OFF) IF(PLUS_USE_DAQMMFCOMBINED_VIDEO) SET (PLUS_USE_DAQVIDEOSOURCE ON CACHE BOOL "Provide support for the DAQ System USB3-FRM13-B + MMF combined device" FORCE) @@ -681,6 +682,13 @@ IF(PLUS_USE_DAQVIDEOSOURCE) ENDIF() ENDIF() +IF(PLUS_USE_FLIRSPINNAKER_CAM) + FIND_PACKAGE(FLIRSPINNAKER_SDK) + IF(NOT FLIRSPINNAKER_SDK_FOUND) + MESSAGE(FATAL_ERROR "This project requires FLIR SPINNAKER SDK for supporting the FLIR camera device. One of the components is missing. Please verify configuration or turn off PLUS_USE_FLIR_SPINNAKER_CAM.") + ENDIF() +ENDIF() + IF(PLUS_USE_ATRACSYS) SET(PLUS_USE_ATRACSYS_DEVICE_TYPE "SET_DEVICE_TYPE" CACHE STRING "Type of Atracsys device to build support for.") SET_PROPERTY(CACHE PLUS_USE_ATRACSYS_DEVICE_TYPE PROPERTY STRINGS stk ftk ftksim) diff --git a/Modules/FindFLIRSpinnakerSDK.cmake b/Modules/FindFLIRSpinnakerSDK.cmake new file mode 100644 index 000000000..46d4a8124 --- /dev/null +++ b/Modules/FindFLIRSpinnakerSDK.cmake @@ -0,0 +1,70 @@ +############################################################################### +# Find FLIR SYSTEMS SPINNAKER SDK +# +# find_package(FLIRSPINNAKERSDK) +# +# Variables defined by this module: +# +# FLIRSPINNAKERSDK_FOUND True if SDK found +# FLIRSPINNAKERSDK_VERSION The version of SDK +# FLIRSPINNAKERSDK_INCLUDE_DIR The location(s) of SDK headers +# FLIRSPINNAKERSDK_LIBRARY_DIR Libraries needed to use SDK +# FLIRSPINNAKERSDK_BINARY_DIR Binaries needed to use SDK + +SET(FLIRSPINNAKER_SDK_PATH_HINTS + "$ENV{PROGRAMFILES}/FLIR Systems/Spinnaker" + ) + +find_path(FLIRSPINNAKER_SDK_DIR include/Spinnaker.h + PATHS ${FLIRSPINNAKER_SDK_PATH_HINTS} + DOC "FLIR SYSTEMS Spinnaker SDK directory") + +if (FLIRSPINNAKER_SDK_DIR) + # Include directories + set(FLIRSPINNAKER_SDK_INCLUDE_DIR ${FLIRSPINNAKER_SDK_DIR}/include) + mark_as_advanced(FLIRSPINNAKER_SDK_INCLUDE_DIR) + + + # Libraries + SET(PLATFORM_SUFFIX "") + SET(LIB_FILENAME "Spinnaker_v140.lib") + SET(SDK_FILENAME "Spinnaker_v140.dll") + + IF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) + SET(PLATFORM_LIB_SUFFIX "lib64/vs2015") + SET(PLATFORM_BIN_SUFFIX "bin64/vs2015") + ENDIF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) + + IF (CMAKE_HOST_WIN32 AND NOT CMAKE_CL_64 ) + SET(PLATFORM_LIB_SUFFIX "lib/vs2015") + SET(PLATFORM_BIN_SUFFIX "bin/vs2015") + ENDIF (CMAKE_HOST_WIN32 AND NOT CMAKE_CL_64 ) + + + + find_library(FLIRSPINNAKER_SDK_LIBRARY + NAMES ${LIB_FILENAME} + PATHS "${FLIRSPINNAKER_SDK_DIR}/${PLATFORM_LIB_SUFFIX}/" NO_DEFAULT_PATH + PATH_SUFFIXES ${PLATFORM_SUFFIX}) + + find_path(FLIRSPINNAKER_SDK_BINARY + NAMES ${SDK_FILENAME} + PATHS "${FLIRSPINNAKER_SDK_DIR}/${PLATFORM_BIN_SUFFIX}/" NO_DEFAULT_PATH + PATH_SUFFIXES ${PLATFORM_SUFFIX}) + + + mark_as_advanced(FLIRSPINNAKER_SDK_LIBRARY) + mark_as_advanced(FLIRSPINNAKER_SDK_BINARY) + + set(FLIRSPINNAKER_BIN_FILE ${FLIRSPINNAKER_SDK_BINARY} "/" ${SDK_FILENAME}) + + set(FLIRSPINNAKER_SDK_VERSION "1.0") + +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(FLIRSPINNAKER_SDK + FOUND_VAR FLIRSPINNAKER_SDK_FOUND + REQUIRED_VARS FLIRSPINNAKER_SDK_DIR FLIRSPINNAKER_SDK_LIBRARY FLIRSPINNAKER_SDK_INCLUDE_DIR + VERSION_VAR FLIRSPINNAKER_SDK_VERSION +) diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index 6ba6e2dfd..4714cfd59 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -303,6 +303,16 @@ IF(PLUS_USE_DAQVIDEOSOURCE) -DDAQVIDEOSOURCE_SDK_DIR:PATH=${DAQVIDEOSOURCE_SDK_DIR} ) ENDIF() + +IF(PLUS_USE_FLIRSPINNAKER_CAM) + LIST(APPEND PLUSBUILD_ADDITIONAL_SDK_ARGS + -DFLIRSPINNAKER_SDK_INCLUDE_DIR:PATH=${FLIRSPINNAKER_SDK_INCLUDE_DIR} + -DFLIRSPINNAKER_SDK_LIBRARY:PATH=${FLIRSPINNAKER_SDK_LIBRARY} + -DFLIRSPINNAKER_SDK_BINARY:PATH=${FLIRSPINNAKER_SDK_BINARY} + -DFLIRSPINNAKER_SDK_DIR:PATH=${FLIRSPINNAKER_SDK_DIR} + ) +ENDIF() + ### PLUS_USE_DAQMMFCOMBINED_VIDEO is virtual. ARGS from DAQVideoSource and MMF_Video. ### IF(PLUS_USE_DAQMMFCOMBINED_VIDEO) ### ENDIF() @@ -574,6 +584,7 @@ ExternalProject_Add(PlusLib -DPLUS_USE_ULTRAVIOLET_PCOUV_CAM:BOOL=${PLUS_USE_ULTRAVIOLET_PCOUV_CAM} -DPLUS_USE_DAQVIDEOSOURCE:BOOL=${PLUS_USE_DAQVIDEOSOURCE} -DPLUS_USE_DAQMMFCOMBINED_VIDEO:BOOL=${PLUS_USE_DAQMMFCOMBINED_VIDEO} + -DPLUS_USE_FLIRSPINNAKER_CAM:BOOL=${PLUS_USE_FLIRSPINNAKER_CAM} -DPLUS_USE_ATRACSYS:BOOL=${PLUS_USE_ATRACSYS} -DPLUS_USE_PICOSCOPE:BOOL=${PLUS_USE_PICOSCOPE} -DPLUS_USE_WITMOTIONTRACKER:BOOL=${PLUS_USE_WITMOTIONTRACKER} From c451d7cce28aba34744da9c2f61e9cfd8c474c26 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Fri, 8 Dec 2023 14:07:02 +0000 Subject: [PATCH 04/13] Update --- CMakeLists.txt | 2 +- Modules/FindFLIRSpinnakerSDK.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ed63d7eb..405f32ece 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -685,7 +685,7 @@ ENDIF() IF(PLUS_USE_FLIRSPINNAKER_CAM) FIND_PACKAGE(FLIRSPINNAKER_SDK) IF(NOT FLIRSPINNAKER_SDK_FOUND) - MESSAGE(FATAL_ERROR "This project requires FLIR SPINNAKER SDK for supporting the FLIR camera device. One of the components is missing. Please verify configuration or turn off PLUS_USE_FLIR_SPINNAKER_CAM.") + MESSAGE(FATAL_ERROR "This project requires FLIR SPINNAKER SDK for supporting the FLIR camera device. One of the components is missing. Please verify configuration or turn off PLUS_USE_FLIRSPINNAKER_CAM.") ENDIF() ENDIF() diff --git a/Modules/FindFLIRSpinnakerSDK.cmake b/Modules/FindFLIRSpinnakerSDK.cmake index 46d4a8124..4aad485a0 100644 --- a/Modules/FindFLIRSpinnakerSDK.cmake +++ b/Modules/FindFLIRSpinnakerSDK.cmake @@ -10,9 +10,10 @@ # FLIRSPINNAKERSDK_INCLUDE_DIR The location(s) of SDK headers # FLIRSPINNAKERSDK_LIBRARY_DIR Libraries needed to use SDK # FLIRSPINNAKERSDK_BINARY_DIR Binaries needed to use SDK +# "$ENV{PROGRAMFILES}/FLIR Systems/Spinnaker" SET(FLIRSPINNAKER_SDK_PATH_HINTS - "$ENV{PROGRAMFILES}/FLIR Systems/Spinnaker" + "C:/Program Files/FLIR Systems/Spinnaker" ) find_path(FLIRSPINNAKER_SDK_DIR include/Spinnaker.h From 580462a8ad7a96e5d5815cb6e5f6bbc560e1fcab Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Fri, 8 Dec 2023 14:10:45 +0000 Subject: [PATCH 05/13] =?UTF-8?q?Actualizaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{FindFLIRSpinnakerSDK.cmake => FindFLIRSpinnaker_SDK.cmake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Modules/{FindFLIRSpinnakerSDK.cmake => FindFLIRSpinnaker_SDK.cmake} (100%) diff --git a/Modules/FindFLIRSpinnakerSDK.cmake b/Modules/FindFLIRSpinnaker_SDK.cmake similarity index 100% rename from Modules/FindFLIRSpinnakerSDK.cmake rename to Modules/FindFLIRSpinnaker_SDK.cmake From f4deb4dce5f457059d9edd73b17052e9c1db4ed9 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Tue, 15 Oct 2024 18:50:22 +0100 Subject: [PATCH 06/13] New code for FX17e hyperspectral camera --- CMakeLists.txt | 8 ++++ Modules/FindSPECIM_SDK.cmake | 71 +++++++++++++++++++++++++++++++ SuperBuild/External_PlusLib.cmake | 11 +++++ 3 files changed, 90 insertions(+) create mode 100644 Modules/FindSPECIM_SDK.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a7c2a6ea..f62550e71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,6 +237,7 @@ OPTION(PLUS_USE_ULTRAVIOLET_PCOUV_CAM "Provide support for capturing an PCO Ultr OPTION(PLUS_USE_DAQVIDEOSOURCE "Provide support for capturing an CameraLink Camera using DAQ System USB3-FRM13-B Grabber" OFF) OPTION(PLUS_USE_DAQMMFCOMBINED_VIDEO "Provide support for capturing an CameraLink Camera using DAQ System USB3-FRM13-B Grabber and MMF Camera" OFF) OPTION(PLUS_USE_FLIRSPINNAKER_CAM "Provide support for capturing an FLIR Spinnaker capture stream" OFF) +OPTION(PLUS_USE_SPECIM_CAM "Provide support for capturing an Specim Fx17e capture stream" OFF) IF(PLUS_USE_DAQMMFCOMBINED_VIDEO) SET (PLUS_USE_DAQVIDEOSOURCE ON CACHE BOOL "Provide support for the DAQ System USB3-FRM13-B + MMF combined device" FORCE) @@ -689,6 +690,13 @@ IF(PLUS_USE_FLIRSPINNAKER_CAM) ENDIF() ENDIF() +IF(PLUS_USE_SPECIM_CAM) + FIND_PACKAGE(SPECIM_SDK) + IF(NOT SPECIM_SDK_FOUND) + MESSAGE(FATAL_ERROR "This project requires Specim - LUMO Sensor SDK for supporting the Specim Fx17e camera device. One of the components is missing. Please verify configuration or turn off PLUS_USE_SPECIM_CAM.") + ENDIF() +ENDIF() + IF(PLUS_USE_ATRACSYS) SET(PLUS_USE_ATRACSYS_DEVICE_TYPE "SET_DEVICE_TYPE" CACHE STRING "Type of Atracsys device to build support for.") SET_PROPERTY(CACHE PLUS_USE_ATRACSYS_DEVICE_TYPE PROPERTY STRINGS stk ftk ftksim) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake new file mode 100644 index 000000000..a2fd62387 --- /dev/null +++ b/Modules/FindSPECIM_SDK.cmake @@ -0,0 +1,71 @@ +############################################################################### +# Find SPECIM - LUMO SDK +# +# find_package(SPECIMSDK) +# +# Variables defined by this module: +# +# SPECIMSDK_FOUND True if SDK found +# SPECIMSDK_VERSION The version of SDK +# SPECIMSDK_INCLUDE_DIR The location(s) of SDK headers +# SPECIMSDK_LIBRARY_DIR Libraries needed to use SDK +# SPECIMSDK_BINARY_DIR Binaries needed to use SDK +# "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" + +SET(SPECIM_SDK_PATH_HINTS + "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" + ) + +find_path(SPECIM_SDK_DIR include/SI_sensor.h + PATHS ${SPECIM_SDK_PATH_HINTS} + DOC "SPECIM - LUMO Sensor SDK directory") + +if (SPECIM_SDK_DIR) + # Include directories + set(SPECIM_SDK_INCLUDE_DIR ${SPECIM_SDK_DIR}/include) + mark_as_advanced(SPECIM_SDK_INCLUDE_DIR) + + + # Libraries + SET(PLATFORM_SUFFIX "") + SET(LIB_FILENAME "SpecSensor.lib") + SET(SDK_FILENAME "SpecSensor.dll") + + IF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) + SET(PLATFORM_LIB_SUFFIX "bin/x64") + SET(PLATFORM_BIN_SUFFIX "bin/x64") + ENDIF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) + + IF (CMAKE_HOST_WIN32 AND NOT CMAKE_CL_64 ) + SET(PLATFORM_LIB_SUFFIX "bin/Win32") + SET(PLATFORM_BIN_SUFFIX "bin/Win32") + ENDIF (CMAKE_HOST_WIN32 AND NOT CMAKE_CL_64 ) + + + + find_library(SPECIM_SDK_LIBRARY + NAMES ${LIB_FILENAME} + PATHS "${SPECIM_SDK_DIR}/${PLATFORM_LIB_SUFFIX}/" NO_DEFAULT_PATH + PATH_SUFFIXES ${PLATFORM_SUFFIX}) + + find_path(SPECIM_SDK_BINARY + NAMES ${SDK_FILENAME} + PATHS "${SPECIM_SDK_DIR}/${PLATFORM_BIN_SUFFIX}/" NO_DEFAULT_PATH + PATH_SUFFIXES ${PLATFORM_SUFFIX}) + + + mark_as_advanced(SPECIM_SDK_LIBRARY) + mark_as_advanced(SPECIM_SDK_BINARY) + + set(SPECIM_BIN_FILE ${SPECIM_SDK_BINARY} "/" ${SDK_FILENAME}) + + set(SPECIM_SDK_VERSION "1.0") + +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SPECIM_SDK + FOUND_VAR SPECIM_SDK_FOUND + REQUIRED_VARS SPECIM_SDK_DIR SPECIM_SDK_LIBRARY SPECIM_SDK_INCLUDE_DIR + VERSION_VAR SPECIM_SDK_VERSION +) diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index b17976287..082af0ea4 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -317,6 +317,16 @@ ENDIF() ### IF(PLUS_USE_DAQMMFCOMBINED_VIDEO) ### ENDIF() +IF(PLUS_USE_SPECIM_CAM) + LIST(APPEND PLUSBUILD_ADDITIONAL_SDK_ARGS + -DSPECIM_SDK_INCLUDE_DIR:PATH=${SPECIM_SDK_INCLUDE_DIR} + -DSPECIM_SDK_LIBRARY:PATH=${SPECIM_SDK_LIBRARY} + -DSPECIM_SDK_BINARY:PATH=${SPECIM_SDK_BINARY} + -DSPECIM_SDK_DIR:PATH=${SPECIM_SDK_DIR} + ) +ENDIF() + + IF(PLUS_USE_INTELREALSENSE) LIST(APPEND PLUSBUILD_ADDITIONAL_SDK_ARGS -DRSSDK_INCLUDE_DIR:PATH=${RSSDK_INCLUDE_DIR} @@ -585,6 +595,7 @@ ExternalProject_Add(PlusLib -DPLUS_USE_DAQVIDEOSOURCE:BOOL=${PLUS_USE_DAQVIDEOSOURCE} -DPLUS_USE_DAQMMFCOMBINED_VIDEO:BOOL=${PLUS_USE_DAQMMFCOMBINED_VIDEO} -DPLUS_USE_FLIRSPINNAKER_CAM:BOOL=${PLUS_USE_FLIRSPINNAKER_CAM} + -DPLUS_USE_SPECIM_CAM:BOOL=${PLUS_USE_SPECIM_CAM} -DPLUS_USE_ATRACSYS:BOOL=${PLUS_USE_ATRACSYS} -DPLUS_USE_PICOSCOPE:BOOL=${PLUS_USE_PICOSCOPE} -DPLUS_USE_WITMOTIONTRACKER:BOOL=${PLUS_USE_WITMOTIONTRACKER} From f5baee50a6539adf9cc61412cf09126cb496ba9a Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Tue, 15 Oct 2024 18:54:54 +0100 Subject: [PATCH 07/13] Update FindSPECIM_SDK.cmake --- Modules/FindSPECIM_SDK.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index a2fd62387..2842aa39f 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -11,9 +11,10 @@ # SPECIMSDK_LIBRARY_DIR Libraries needed to use SDK # SPECIMSDK_BINARY_DIR Binaries needed to use SDK # "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" +# "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" SET(SPECIM_SDK_PATH_HINTS - "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" + "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" ) find_path(SPECIM_SDK_DIR include/SI_sensor.h From 64e7d79047bdf5467e4c45135d7d7f7e58576400 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Tue, 15 Oct 2024 18:57:42 +0100 Subject: [PATCH 08/13] Update FindSPECIM_SDK.cmake --- Modules/FindSPECIM_SDK.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index 2842aa39f..a2fd62387 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -11,10 +11,9 @@ # SPECIMSDK_LIBRARY_DIR Libraries needed to use SDK # SPECIMSDK_BINARY_DIR Binaries needed to use SDK # "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" -# "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" SET(SPECIM_SDK_PATH_HINTS - "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" + "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" ) find_path(SPECIM_SDK_DIR include/SI_sensor.h From 879c2559b1606cdf3fb35c2fad2aa519d95f53a6 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Tue, 15 Oct 2024 19:00:23 +0100 Subject: [PATCH 09/13] Update FindSPECIM_SDK.cmake --- Modules/FindSPECIM_SDK.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index a2fd62387..2842aa39f 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -11,9 +11,10 @@ # SPECIMSDK_LIBRARY_DIR Libraries needed to use SDK # SPECIMSDK_BINARY_DIR Binaries needed to use SDK # "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" +# "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" SET(SPECIM_SDK_PATH_HINTS - "C:/Program Files (x86)/Specim/SDKs/Lumo_Sensor_SDK" + "$ENV{ProgramFiles\(x86\)}/Specim/SDKs/Lumo_Sensor_SDK" ) find_path(SPECIM_SDK_DIR include/SI_sensor.h From ae57cbcbefc0a0e00e71e91df993dc4a79f3ead3 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Sun, 20 Oct 2024 17:35:49 +0100 Subject: [PATCH 10/13] Update FindSPECIM_SDK.cmake --- Modules/FindSPECIM_SDK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index 2842aa39f..df4d78cac 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -31,7 +31,7 @@ if (SPECIM_SDK_DIR) SET(PLATFORM_SUFFIX "") SET(LIB_FILENAME "SpecSensor.lib") SET(SDK_FILENAME "SpecSensor.dll") - + IF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) SET(PLATFORM_LIB_SUFFIX "bin/x64") SET(PLATFORM_BIN_SUFFIX "bin/x64") @@ -50,7 +50,7 @@ if (SPECIM_SDK_DIR) PATH_SUFFIXES ${PLATFORM_SUFFIX}) find_path(SPECIM_SDK_BINARY - NAMES ${SDK_FILENAME} + NAMES ${SDK_FILENAME} "grab014.dll" PATHS "${SPECIM_SDK_DIR}/${PLATFORM_BIN_SUFFIX}/" NO_DEFAULT_PATH PATH_SUFFIXES ${PLATFORM_SUFFIX}) From 12896b88ea8c9d585ae6807764be5fd8bf791254 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Tue, 22 Oct 2024 10:38:01 +0100 Subject: [PATCH 11/13] Update FindSPECIM_SDK.cmake --- Modules/FindSPECIM_SDK.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index df4d78cac..ed0205efe 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -50,7 +50,7 @@ if (SPECIM_SDK_DIR) PATH_SUFFIXES ${PLATFORM_SUFFIX}) find_path(SPECIM_SDK_BINARY - NAMES ${SDK_FILENAME} "grab014.dll" + NAMES ${SDK_FILENAME} PATHS "${SPECIM_SDK_DIR}/${PLATFORM_BIN_SUFFIX}/" NO_DEFAULT_PATH PATH_SUFFIXES ${PLATFORM_SUFFIX}) From f77f3d13a0fdd32977b23b913f81f1ad4b4de8f7 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Fri, 25 Oct 2024 12:54:31 +0100 Subject: [PATCH 12/13] Update FindSPECIM_SDK.cmake --- Modules/FindSPECIM_SDK.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index ed0205efe..7f580774f 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -55,6 +55,15 @@ if (SPECIM_SDK_DIR) PATH_SUFFIXES ${PLATFORM_SUFFIX}) + set(SPECIM_SDK_DLLS + ${SPECIM_SDK_BINARY}/${SDK_FILENAME} + ${SPECIM_SDK_BINARY}/grab014.dll + ${SPECIM_SDK_BINARY}/PvBase64.dll + ${SPECIM_SDK_BINARY}/PvStream64.dll + ${SPECIM_SDK_BINARY}/tbb.dll + ${SPECIM_SDK_BINARY}/PvDevice64.dll + ${SPECIM_SDK_BINARY}/tbbmalloc.dll) + mark_as_advanced(SPECIM_SDK_LIBRARY) mark_as_advanced(SPECIM_SDK_BINARY) From 61f98cf624ff2fefae4e9a557f8f7fdce2c1c5e6 Mon Sep 17 00:00:00 2001 From: fmarcanoull Date: Fri, 25 Oct 2024 15:44:29 +0100 Subject: [PATCH 13/13] DLLs for SPecim Cam Fx17e --- Modules/FindSPECIM_SDK.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Modules/FindSPECIM_SDK.cmake b/Modules/FindSPECIM_SDK.cmake index 7f580774f..964dfe931 100644 --- a/Modules/FindSPECIM_SDK.cmake +++ b/Modules/FindSPECIM_SDK.cmake @@ -54,8 +54,8 @@ if (SPECIM_SDK_DIR) PATHS "${SPECIM_SDK_DIR}/${PLATFORM_BIN_SUFFIX}/" NO_DEFAULT_PATH PATH_SUFFIXES ${PLATFORM_SUFFIX}) - - set(SPECIM_SDK_DLLS + IF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) + SET(SPECIM_SDK_DLLS ${SPECIM_SDK_BINARY}/${SDK_FILENAME} ${SPECIM_SDK_BINARY}/grab014.dll ${SPECIM_SDK_BINARY}/PvBase64.dll @@ -63,7 +63,16 @@ if (SPECIM_SDK_DIR) ${SPECIM_SDK_BINARY}/tbb.dll ${SPECIM_SDK_BINARY}/PvDevice64.dll ${SPECIM_SDK_BINARY}/tbbmalloc.dll) - + ENDIF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) + + IF (CMAKE_HOST_WIN32 AND NOT CMAKE_CL_64 ) + SET(SPECIM_SDK_DLLS + ${SPECIM_SDK_BINARY}/${SDK_FILENAME} + ${SPECIM_SDK_BINARY}/grab014.dll + ${SPECIM_SDK_BINARY}/tbb.dll + ${SPECIM_SDK_BINARY}/tbbmalloc.dll) + ENDIF (CMAKE_HOST_WIN32 AND NOT CMAKE_CL_64 ) + mark_as_advanced(SPECIM_SDK_LIBRARY) mark_as_advanced(SPECIM_SDK_BINARY)