diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2714f11..4bb3d3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,17 @@ set(CPACK_COMPONENTS_GROUPING IGNORE)
 set(CPACK_COMPONENTS_ALL pdb Unspecified)
 set(CPACK_PACKAGE_VERSION ${GIT_DESCRIBE})
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-x86_64")
+  if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
+    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-arm64")
+  else ()
+    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-x86_64")
+  endif ()
 else ()
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-x86")
+  if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-arm")
+  else ()
+    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-x86")
+  endif ()
 endif ()
 set(CPACK_ARCHIVE_PDB_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-pdbs")
 set(CPACK_ARCHIVE_UNSPECIFIED_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")
@@ -73,7 +81,14 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   if (WIN32)
     get_filename_component(_PREFIX "${GSTREAMER_PLUGIN_DIR}/../" REALPATH)
   else ()
-    set(_PREFIX "/usr/lib")
+    # Use architecture-specific library path on Linux
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
+      set(_PREFIX "/usr/lib/aarch64-linux-gnu")
+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+      set(_PREFIX "/usr/lib/arm-linux-gnueabihf")
+    else ()
+      set(_PREFIX "/usr/lib")
+    endif ()
   endif ()
   set(CMAKE_INSTALL_PREFIX "${_PREFIX}"
       CACHE PATH "Common prefix for all installed files (e.g., plugins will be installed under CMAKE_INSTALL_PREFIX/gstreamer-1.0)" FORCE)
diff --git a/cmake/modules/FindATK.cmake b/cmake/modules/FindATK.cmake
deleted file mode 100644
index 762e144..0000000
--- a/cmake/modules/FindATK.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{ATK_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${ATK_DIR}" TRY2_DIR)
-FILE(GLOB ATK_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(ATK_INCLUDE_DIR atk/atk.h
-                          PATHS ${ATK_DIR}/include /usr/local/include/atk-1.0 /usr/include/atk-1.0
-                          ENV INCLUDE DOC "Directory containing atk/atk.h include file")
-
-IF (ATK_INCLUDE_DIR)
-  SET(ATK_FOUND TRUE)
-ENDIF (ATK_INCLUDE_DIR)
diff --git a/cmake/modules/FindAptina.cmake b/cmake/modules/FindAptina.cmake
deleted file mode 100644
index b1127b7..0000000
--- a/cmake/modules/FindAptina.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# - Try to find Aptina SDK
-# Once done this will define
-#
-#  APTINA_FOUND - system has Aptina SDK
-#  APTINA_INCLUDE_DIR - the Aptina SDK include directory
-#  APTINA_LIBRARIES - the libraries needed to use Aptina SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2017 outside US, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT APTINA_DIR)
-    set (APTINA_DIR "C:/Aptina Imaging" CACHE PATH "Directory containing Aptina SDK includes and libraries")
-endif ()
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    set(_LIB_NAME "apbase")
-else ()
-    set(_LIB_NAME "apbase")
-endif ()
-
-find_path (APTINA_INCLUDE_DIR apbase.h
-    PATHS
-    "${APTINA_DIR}/include"
-    DOC "Directory containing Aptina include files")
-
-find_library (APTINA_LIBRARIES NAMES ${_LIB_NAME}
-    PATHS
-    "${APTINA_DIR}/lib")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (APTINA  DEFAULT_MSG  APTINA_INCLUDE_DIR APTINA_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/modules/FindBitflow.cmake b/cmake/modules/FindBitflow.cmake
deleted file mode 100644
index f125b4e..0000000
--- a/cmake/modules/FindBitflow.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# - Try to find Bitflow SDK
-# Once done this will define
-#
-#  BITFLOW_FOUND - system has Bitflow SDK
-#  BITFLOW_INCLUDE_DIR - the Bitflow SDK include directory
-#  BITFLOW_LIBRARIES - the libraries needed to use Bitflow SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2016 outside US, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT BITFLOW_DIR)
-    set (BITFLOW_DIR "C:/BitFlow SDK 6.20" CACHE PATH "Directory containing Bitflow SDK includes and libraries")
-endif ()
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    set(_LIB_PATH "${BITFLOW_DIR}/Lib64")
-else ()
-    set(_LIB_PATH "${BITFLOW_DIR}/Lib32")
-endif ()
-
-find_path (BITFLOW_INCLUDE_DIR BiApi.h
-    PATHS
-    "${BITFLOW_DIR}/Include"
-    DOC "Directory containing BiApi.h include file")
-
-find_library (_BidLib NAMES bid
-    PATHS
-    "${_LIB_PATH}")
-
-find_library (_BfdLib NAMES bfd
-    PATHS
-    "${_LIB_PATH}")
-
-set (BITFLOW_LIBRARIES ${_BidLib} ${_BfdLib})
-
-mark_as_advanced (_BidLib _BfdLib)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (BITFLOW  DEFAULT_MSG  BITFLOW_INCLUDE_DIR BITFLOW_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake
deleted file mode 100644
index 9ad0be4..0000000
--- a/cmake/modules/FindCairo.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{CAIRO_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${CAIRO_DIR}" TRY2_DIR)
-FILE(GLOB CAIRO_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(CAIRO_INCLUDE_DIR cairo.h
-                            PATHS ${CAIRO_DIR}/include /usr/local/include/cairo /usr/include/cairo
-                            ENV INCLUDE DOC "Directory containing cairo.h include file")
-
-IF (CAIRO_INCLUDE_DIR)
-  SET(CAIRO_FOUND TRUE)
-ENDIF (CAIRO_INCLUDE_DIR)
diff --git a/cmake/modules/FindEDT.cmake b/cmake/modules/FindEDT.cmake
deleted file mode 100644
index 8c3f7f0..0000000
--- a/cmake/modules/FindEDT.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# - Try to find EDT PDV
-# Once done this will define
-#
-#  EDT_FOUND - system has EDT PDV
-#  EDT_INCLUDE_DIR - the EDT PDV include directory
-#  EDT_LIBRARIES - the libraries needed to use the EDT PDV
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT EDT_DIR)
-    set (EDT_DIR "C:/EDT" CACHE PATH "Directory containing EDT PDV")
-endif (NOT EDT_DIR)
-
-find_path (EDT_INCLUDE_DIR edtinc.h
-    PATHS
-    "${EDT_DIR}/pdv"
-    DOC "Directory containing edtinc.h include file")
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-find_library (EDT_LIBRARIES NAMES pdvlib
-    PATHS
-    "${EDT_DIR}/pdv/lib/amd64"
-    DOC "EDT library to link with")
-else ()
-find_library (EDT_LIBRARIES NAMES pdvlib
-    PATHS
-    "${EDT_DIR}/pdv/lib/x86"
-    DOC "EDT library to link with")
-endif ()
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (EDT  DEFAULT_MSG  EDT_INCLUDE_DIR EDT_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/modules/FindEuresys.cmake b/cmake/modules/FindEuresys.cmake
deleted file mode 100644
index 63e30ce..0000000
--- a/cmake/modules/FindEuresys.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-# - Try to find Euresys Multicam
-# Once done this will define
-#
-#  EURESYS_FOUND - system has Euresys Multicam
-#  EURESYS_INCLUDE_DIR - the Euresys Multicam include directory
-#  EURESYS_LIBRARIES - the libraries needed to use Euresys Multicam
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2015, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT EURESYS_DIR)
-    # Euresys seems to be installed in the 32-bit dir on 32- or 64-bit Windows
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-
-    # use (x86) dir if exists
-    if (_PROG_FILES_X86)
-        set(_PROG_FILES "${_PROG_FILES_X86}")
-    endif ()
-
-    set (EURESYS_DIR "${_PROG_FILES}/Euresys/MultiCam" CACHE PATH "Directory containing Euresys Multicam includes and libraries")
-
-    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        set(_LIB_PATH "${EURESYS_DIR}/lib/amd64")
-    else ()
-        set(_LIB_PATH "${EURESYS_DIR}/lib")
-    endif ()
-endif ()
-
-find_path (EURESYS_INCLUDE_DIR multicam.h
-    PATHS
-    "${EURESYS_DIR}/include"
-    DOC "Directory containing multicam.h include file")
-
-find_library (EURESYS_LIBRARIES NAMES MultiCam
-    PATHS
-    "${_LIB_PATH}"
-    DOC "EURESYS library to link with")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (EURESYS  DEFAULT_MSG  EURESYS_INCLUDE_DIR EURESYS_LIBRARIES)
diff --git a/cmake/modules/FindFreeImage.cmake b/cmake/modules/FindFreeImage.cmake
deleted file mode 100644
index 5278e0f..0000000
--- a/cmake/modules/FindFreeImage.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Try to find the FreeImage library and include path.
-# Once done this will define
-#
-# FREEIMAGE_FOUND
-# FREEIMAGE_INCLUDE_DIR
-# FREEIMAGE_LIBRARY
-# 
-
-IF (WIN32)
-	FIND_PATH( FREEIMAGE_INCLUDE_DIR FreeImage.h
-		${PROJECT_SOURCE_DIR}/extern/FreeImage
-		DOC "The directory where FreeImage.h resides")
-	FIND_LIBRARY( FREEIMAGE_LIBRARY
-		NAMES FreeImage freeimage
-		PATHS
-		${PROJECT_SOURCE_DIR}/extern/FreeImage
-		DOC "The FreeImage library")
-ELSE (WIN32)
-	FIND_PATH( FREEIMAGE_INCLUDE_DIR FreeImage.h
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include
-		DOC "The directory where FreeImage.h resides")
-	FIND_LIBRARY( FREEIMAGE_LIBRARY
-		NAMES FreeImage freeimage
-		PATHS
-		/usr/lib64
-		/usr/lib
-		/usr/local/lib64
-		/usr/local/lib
-		/sw/lib
-		/opt/local/lib
-		DOC "The FreeImage library")
-ENDIF (WIN32)
-
-SET(FREEIMAGE_LIBRARIES ${FREEIMAGE_LIBRARY})
-
-IF (FREEIMAGE_INCLUDE_DIR AND FREEIMAGE_LIBRARY)
-	SET( FREEIMAGE_FOUND TRUE CACHE BOOL "Set to TRUE if GLEW is found, FALSE otherwise")
-ELSE (FREEIMAGE_INCLUDE_DIR AND FREEIMAGE_LIBRARY)
-	SET( FREEIMAGE_FOUND FALSE CACHE BOOL "Set to TRUE if GLEW is found, FALSE otherwise")
-ENDIF (FREEIMAGE_INCLUDE_DIR AND FREEIMAGE_LIBRARY)
-
-MARK_AS_ADVANCED(
-	FREEIMAGE_FOUND 
-	FREEIMAGE_LIBRARY
-	FREEIMAGE_LIBRARIES
-	FREEIMAGE_INCLUDE_PATH)
-
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
index 695e924..b88c0d6 100644
--- a/cmake/modules/FindGStreamer.cmake
+++ b/cmake/modules/FindGStreamer.cmake
@@ -48,7 +48,11 @@ endif ()
 
 find_library(GSTREAMER_LIBRARY
              NAMES gstreamer-${GSTREAMER_ABI_VERSION}
-             HINTS ${PKG_GSTREAMER_LIBRARY_DIRS} ${PKG_GSTREAMER_LIBDIR} ${GSTREAMER_ROOT}/lib ${GSTREAMER_ROOT}/lib/aarch64-linux-gnu)
+             HINTS ${PKG_GSTREAMER_LIBRARY_DIRS} ${PKG_GSTREAMER_LIBDIR} ${GSTREAMER_ROOT}/lib
+                   ${GSTREAMER_ROOT}/lib/aarch64-linux-gnu
+                   ${GSTREAMER_ROOT}/lib/arm-linux-gnueabihf
+                   /usr/lib/aarch64-linux-gnu
+                   /usr/lib/arm-linux-gnueabihf)
 
 find_path(GSTREAMER_INCLUDE_DIR
           gst/gst.h
diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake
deleted file mode 100644
index 58e8af4..0000000
--- a/cmake/modules/FindGTK2.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{GTK2_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${GTK2_DIR}" TRY2_DIR)
-FILE(GLOB GTK_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(GTK_gtk_2_INCLUDE_DIR gtk/gtk.h
-                                PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0
-                                ENV INCLUDE DOC "Directory containing gtk/gtk.h include file")
-
-FIND_PATH(GTK_gdk_2_INCLUDE_DIR gdk/gdk.h
-                                PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0
-                                ENV INCLUDE DOC "Directory containing gdk/gdk.h include file")
-
-FIND_PATH(GTK_gdkconfig_2_INCLUDE_DIR gdkconfig.h
-                                      PATHS ${GTK_DIR}/include ${GTK_DIR}/lib/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 /usr/lib/gtk-2.0/include /usr/local/lib/gtk-2.0/include
-                                      ENV INCLUDE DOC "Directory containing gdkconfig.h include file")
-
-FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0
-                                      PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/local/lib /usr/lib
-                                      ENV LIB
-                                      DOC "gdk_pixbuf library to link with"
-                                      NO_SYSTEM_ENVIRONMENT_PATH)
-
-FIND_LIBRARY(GTK_gdk_2_LIBRARY NAMES gdk-win32-2.0 gdk-x11-2.0
-                                     PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib
-                                     ENV LIB
-                                     DOC "gdk2 library to link with"
-                                     NO_SYSTEM_ENVIRONMENT_PATH)
-
-FIND_LIBRARY(GTK_gtk_2_LIBRARY NAMES gtk-win32-2.0 gtk-x11-2.0
-                                     PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib
-                                     ENV LIB
-                                     DOC "gtk2 library to link with"
-                                     NO_SYSTEM_ENVIRONMENT_PATH)
-
-
-IF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND
-    GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY)
-  SET(GTK2_INCLUDE_DIR ${GTK_gtk_2_INCLUDE_DIR} ${GTK_gdk_2_INCLUDE_DIR} ${GTK_gdkconfig_2_INCLUDE_DIR})
-  list(REMOVE_DUPLICATES GTK2_INCLUDE_DIR)
-  SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_2_LIBRARY} ${GTK_gtk_2_LIBRARY})
-  list(REMOVE_DUPLICATES GTK2_LIBRARIES)
-  SET(GTK2_FOUND TRUE)
-ENDIF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND
-       GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY)
diff --git a/cmake/modules/FindGigESim.cmake b/cmake/modules/FindGigESim.cmake
deleted file mode 100644
index 28f93d9..0000000
--- a/cmake/modules/FindGigESim.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# - Try to find A&B Soft GigESim
-# Once done this will define
-#
-#  GIGESIM_FOUND - system has A&B Soft GigESim
-#  GIGESIM_INCLUDE_DIR - the A&B Soft GigESim include directory
-#  GIGESIM_LIBRARIES - the libraries needed to use the A&B Soft GigESim
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT GIGESIM_DIR)
-	set (GIGESIM_DIR "C:/Program Files/GigESim" CACHE PATH "Directory containing A&B Soft GigESim")
-endif (NOT GIGESIM_DIR)
-
-find_path (GIGESIM_INCLUDE_DIR GigeSimSDK.h
-    PATHS
-    "${GIGESIM_DIR}/Include"
-    DOC "Directory containing GigESim include file")
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-find_library (GIGESIM_LIBRARIES NAMES gigesimsdk64.lib
-    PATHS
-    "${GIGESIM_DIR}/Lib"
-    DOC "GIGESIM library to link with")
-else ()
-find_library (GIGESIM_LIBRARIES NAMES gigesimsdk
-    PATHS
-    "${GIGESIM_DIR}/Lib"
-    DOC "GIGESIM library to link with")
-endif ()
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (GIGESIM  DEFAULT_MSG  GIGESIM_INCLUDE_DIR GIGESIM_LIBRARIES)
diff --git a/cmake/modules/FindGlew.cmake b/cmake/modules/FindGlew.cmake
deleted file mode 100644
index 463d705..0000000
--- a/cmake/modules/FindGlew.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{GLEW_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${GLEW_DIR}" TRY2_DIR)
-FILE(GLOB GLEW_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h
-                           PATHS ${GLEW_DIR}/include /usr/local/include /usr/include
-                           ENV INCLUDE DOC "Directory containing GL/glew.h include file")
-
-FIND_LIBRARY(GLEW_LIBRARY NAMES glew32 GLEW glew32s
-                          PATHS ${GLEW_DIR}/bin ${GLEW_DIR}/win32/bin ${GLEW_DIR}/lib ${GLEW_DIR}/win32/lib /usr/local/lib /usr/lib
-                          ENV LIB
-                          DOC "glew library to link with"
-                          NO_SYSTEM_ENVIRONMENT_PATH)
-
-IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
-   SET(GLEW_FOUND TRUE)
-ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
diff --git a/cmake/modules/FindIDSuEye.cmake b/cmake/modules/FindIDSuEye.cmake
index bc8f19e..b282db2 100644
--- a/cmake/modules/FindIDSuEye.cmake
+++ b/cmake/modules/FindIDSuEye.cmake
@@ -29,19 +29,29 @@ endif (WIN32)
 
 if (UNIX)
     if (NOT IDSUEYE_DIR)
-        set (IDSUEYE_DIR "/usr" CACHE PATH "Directory containing IDS uEye SDK includes and libraries")
+        set (IDSUEYE_DIR "/opt/ids/ueye" CACHE PATH "Directory containing IDS uEye SDK includes and libraries")
     endif ()
 
     set(_LIB_NAME "libueye_api.so")
 
-    find_path (IDSUEYE_INCLUDE_DIR ueye.h
+    find_path (IDSUEYE_INCLUDE_DIR uEye.h
     PATHS
+    "${CMAKE_CURRENT_SOURCE_DIR}/sys/idsueye/include"
     "${IDSUEYE_DIR}/include"
+    "/opt/ids/ueye/include"
+    "/usr/include/ueye"
+    "/usr/include"
     DOC "Directory containing IDS uEye include files")
 endif (UNIX)
 
 find_library (_uEyeLib NAMES ${_LIB_NAME}
 PATHS
+"${IDSUEYE_DIR}/lib"
+"${IDSUEYE_DIR}/lib/aarch64-linux-gnu"
+"${IDSUEYE_DIR}/lib/arm-linux-gnueabihf"
+"/opt/ids/ueye/lib"
+"/opt/ids/ueye/lib/aarch64-linux-gnu"
+"/opt/ids/ueye/lib/arm-linux-gnueabihf"
 "${IDSUEYE_DIR}/Lib")
 
 set (IDSUEYE_LIBRARIES ${_uEyeLib})
diff --git a/cmake/modules/FindIOtechDaqX.cmake b/cmake/modules/FindIOtechDaqX.cmake
deleted file mode 100644
index 1185e0d..0000000
--- a/cmake/modules/FindIOtechDaqX.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# - Try to find IOtech DaqX SDK
-# Once done this will define
-#
-#  IOTECHDAQX_FOUND - system has IOtech DaqX SDK
-#  IOTECHDAQX_INCLUDE_DIR - the IOtech DaqX SDK include directory
-#  IOTECHDAQX_LIBRARIES - the libraries needed to use IOtech DaqX
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (IOTECHDAQX_INCLUDE_DIR AND IOTECHDAQX_LIBRARIES)
-   # in cache already
-   SET(IOTECHDAQX_FIND_QUIETLY TRUE)
-ELSE (IOTECHDAQX_INCLUDE_DIR AND IOTECHDAQX_LIBRARIES)
-   SET(IOTECHDAQX_FIND_QUIETLY FALSE)
-ENDIF (IOTECHDAQX_INCLUDE_DIR AND IOTECHDAQX_LIBRARIES)
-
-IF (NOT IOTECHDAQX_DIR)
-    SET (IOTECHDAQX_DIR "C:/Program Files/DaqX" CACHE PATH "Directory containing IOtech DaqX")
-ENDIF (NOT IOTECHDAQX_DIR)
-
-FIND_PATH (IOTECHDAQX_INCLUDE_DIR DAQX.H
-    PATHS
-    "${IOTECHDAQX_DIR}/Programming Language Support/WaveBook/C/32-bit Enhanced API"
-    DOC "Directory containing DAQX.H include file")
-
-FIND_LIBRARY (IOTECHDAQX_LIBRARIES NAMES DAQX
-    PATHS
-    "${IOTECHDAQX_DIR}/Programming Language Support/WaveBook/C/32-bit Enhanced API"
-    DOC "IOTECHDAQX library to link with")
-
-IF (IOTECHDAQX_INCLUDE_DIR)
-   #MESSAGE(STATUS "DEBUG: Found IOtech DaqX include dir: ${IOTECHDAQX_INCLUDE_DIR}")
-ELSE (IOTECHDAQX_INCLUDE_DIR)
-   MESSAGE(STATUS "IOTECHDAQX: WARNING: include dir not found")
-ENDIF (IOTECHDAQX_INCLUDE_DIR)
-
-IF (IOTECHDAQX_LIBRARIES)
-   #MESSAGE(STATUS "DEBUG: Found IOtech DaqX library: ${IOTECHDAQX_LIBRARIES}")
-ELSE (IOTECHDAQX_LIBRARIES)
-   MESSAGE(STATUS "IOTECHDAQX: WARNING: library not found")
-ENDIF (IOTECHDAQX_LIBRARIES)
-
-INCLUDE (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (IOTECHDAQX  DEFAULT_MSG  IOTECHDAQX_INCLUDE_DIR IOTECHDAQX_LIBRARIES)
-
-MARK_AS_ADVANCED(IOTECHDAQX_INCLUDE_DIR IOTECHDAQX_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/modules/FindImperx.cmake b/cmake/modules/FindImperx.cmake
deleted file mode 100644
index d2003a8..0000000
--- a/cmake/modules/FindImperx.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# - Try to find Imperx FrameLink Express
-# Once done this will define
-#
-#  IMPERX_FLEX_FOUND - system has Imperx FrameLink Express
-#  IMPERX_FLEX_INCLUDE_DIR - the Imperx FrameLink Express include directory
-#  IMPERX_FLEX_LIBRARIES - the libraries needed to use Imperx FrameLink Express
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2015, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IMPERX_FLEX_DIR)
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    # 64-bit dir on win64
-    file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
-    if (_PROG_FILES_X86)
-        set(_PROGFILESDIR "${_PROG_FILES_W6432}")
-    else ()
-        set(_PROGFILESDIR "${_PROG_FILES}")
-    endif ()
-	
-	set (IMPERX_FLEX_DIR "${_PROGFILESDIR}/Imperx/FrameLink Express" CACHE PATH "Directory containing Imperx FrameLink Express includes and libraries")
-	
-	if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        set(_LIB_PATH "${IMPERX_FLEX_DIR}/SDK/lib/x64")
-    else ()
-        set(_LIB_PATH "${IMPERX_FLEX_DIR}/SDK/lib/win32")
-    endif ()
-endif ()
-
-find_path (IMPERX_FLEX_INCLUDE_DIR VCECLB.h
-    PATHS
-    "${IMPERX_FLEX_DIR}/SDK/inc"
-    DOC "Directory containing VCECLB.h include file")
-
-find_library (IMPERX_FLEX_LIBRARIES NAMES VCECLB
-    PATHS
-    "${_LIB_PATH}"
-    DOC "Imperx FrameLink Express library to link with")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (IMPERX_FLEX  DEFAULT_MSG  IMPERX_FLEX_INCLUDE_DIR IMPERX_FLEX_LIBRARIES)
diff --git a/cmake/modules/FindImperxSDI.cmake b/cmake/modules/FindImperxSDI.cmake
deleted file mode 100644
index 21bc01c..0000000
--- a/cmake/modules/FindImperxSDI.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# - Try to find Imperx FrameLink Express
-# Once done this will define
-#
-#  IMPERX_SDI_FOUND - system has Imperx SDI
-#  IMPERX_SDI_INCLUDE_DIR - the Imperx SDI include directory
-#  IMPERX_SDI_LIBRARIES - the libraries needed to use Imperx SDI
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2019, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IMPERX_SDI_DIR)
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    # 64-bit dir on win64
-    file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
-    if (_PROG_FILES_X86)
-        set(_PROGFILESDIR "${_PROG_FILES_W6432}")
-    else ()
-        set(_PROGFILESDIR "${_PROG_FILES}")
-    endif ()
-	
-    set (IMPERX_SDI_DIR "${_PROGFILESDIR}/Imperx/HD-SDI Express" CACHE PATH "Directory containing Imperx HD-SDI Express includes and libraries")
-	
-	if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        set(_LIB_PATH "${IMPERX_SDI_DIR}/SDK/lib/x64")
-    else ()
-        set(_LIB_PATH "${IMPERX_SDI_DIR}/SDK/lib/win32")
-    endif ()
-endif ()
-
-find_path (IMPERX_SDI_INCLUDE_DIR VCESDI.h
-    PATHS
-    "${IMPERX_SDI_DIR}/SDK/inc"
-    DOC "Directory containing VCESDI.h include file")
-
-find_library (IMPERX_SDI_LIBRARIES NAMES VCESDI
-    PATHS
-    "${_LIB_PATH}"
-    DOC "Imperx HD-SDI Express library to link with")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (IMPERX_SDI  DEFAULT_MSG  IMPERX_SDI_INCLUDE_DIR IMPERX_SDI_LIBRARIES)
diff --git a/cmake/modules/FindKAYA.cmake b/cmake/modules/FindKAYA.cmake
deleted file mode 100644
index fd82a40..0000000
--- a/cmake/modules/FindKAYA.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Try to find KAYA SDK
-# Once done this will define
-#
-#  KAYA_FOUND - system has KAYA SDK
-#  KAYA_INCLUDE_DIR - the KAYA SDK include directory
-#  KAYA_LIBRARIES - the libraries needed to use KAYA SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2018 outside US, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT KAYA_DIR)
-    set (KAYA_DIR "C:/Program Files/KAYA Instruments/Vision Point" CACHE PATH "Directory containing KAYA SDK includes and libraries")
-endif ()
-
-find_path (KAYA_INCLUDE_DIR KYFGLib.h
-    PATHS
-    "${KAYA_DIR}/include"
-    DOC "Directory containing KYFGLib.h include file")
-
-find_library (_KYFGLib NAMES KYFGLib
-    PATHS
-    "${KAYA_DIR}/lib")
-
-set (KAYA_LIBRARIES ${_KYFGLib})
-
-mark_as_advanced (_KYFGLib)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (KAYA  DEFAULT_MSG  KAYA_INCLUDE_DIR KAYA_LIBRARIES)
diff --git a/cmake/modules/FindLibIconv.cmake b/cmake/modules/FindLibIconv.cmake
deleted file mode 100644
index 5206c01..0000000
--- a/cmake/modules/FindLibIconv.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-if (NOT LIBICONV_DIR)
-    set (LIBICONV_DIR "" CACHE PATH "Directory containing iconv.h")
-endif ()
-
-FILE(TO_CMAKE_PATH "$ENV{LIBICONV_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${LIBICONV_DIR}" TRY2_DIR)
-FILE(GLOB LIBICONV_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(LIBICONV_INCLUDE_DIR iconv.h
-                               PATHS ${LIBICONV_DIR}/include /usr/local/include /usr/include
-                               ENV INCLUDE DOC "Directory containing iconv.h include file")
-mark_as_advanced (LIBICONV_INCLUDE_DIR)
-
-IF (LIBICONV_INCLUDE_DIR)
-  SET(LIBICONV_FOUND TRUE)
-ENDIF (LIBICONV_INCLUDE_DIR)
diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake
deleted file mode 100644
index c172566..0000000
--- a/cmake/modules/FindLibXml2.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-if (NOT LIBXML2_DIR)
-    set (LIBXML2_DIR "" CACHE PATH "Directory containing libxml")
-endif ()
-
-FILE(TO_CMAKE_PATH "$ENV{LIBXML2_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${LIBXML2_DIR}" TRY2_DIR)
-FILE(GLOB LIBXML2_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(LIBXML2_INCLUDE_DIR libxml/parser.h
-                              PATHS ${LIBXML2_DIR}/include ${LIBXML2_DIR}/include/libxml2 /usr/local/include/libxml2 /usr/include/libxml2
-                              ENV INCLUDE DOC "Directory containing libxml/parser.h include file")
-mark_as_advanced (LIBXML2_INCLUDE_DIR)
-
-IF (LIBXML2_INCLUDE_DIR)
-  SET(LIBXML2_FOUND TRUE)
-ENDIF (LIBXML2_INCLUDE_DIR)
diff --git a/cmake/modules/FindLibpng.cmake b/cmake/modules/FindLibpng.cmake
deleted file mode 100644
index 648db97..0000000
--- a/cmake/modules/FindLibpng.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{PNG_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${PNG_DIR}" TRY2_DIR)
-FILE(GLOB PNG_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(PNG_INCLUDE_DIR png.h
-                           PATHS ${PNG_DIR}/include /usr/local/include /usr/include
-                           ENV INCLUDE DOC "Directory containing png.h include file")
-
-FIND_LIBRARY(PNG_LIBRARY NAMES png12 png
-                          PATHS ${PNG_DIR}/bin ${PNG_DIR}/win32/bin ${PNG_DIR}/lib ${PNG_DIR}/win32/lib /usr/local/lib /usr/lib
-                          ENV LIB
-                          DOC "png library to link with"
-                          NO_SYSTEM_ENVIRONMENT_PATH)
-
-IF (PNG_INCLUDE_DIR AND PNG_LIBRARY)
-   SET(PNG_FOUND TRUE)
-ENDIF (PNG_INCLUDE_DIR AND PNG_LIBRARY)
diff --git a/cmake/modules/FindMatrox.cmake b/cmake/modules/FindMatrox.cmake
deleted file mode 100644
index 179506f..0000000
--- a/cmake/modules/FindMatrox.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-# - Try to find Matrox MIL SDK
-# Once done this will define
-#
-#  MATROX_FOUND - system has Matrox MIL SDK
-#  MATROX_INCLUDE_DIR - the Matrox MIL SDK include directory
-#  MATROX_LIBRARIES - the libraries needed to use Matrox MIL SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2017 outside US, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT MATROX_DIR)
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    # 64-bit dir on win64
-    file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
-
-    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        set(_PROGFILESDIR "${_PROG_FILES_W6432}")
-    else ()
-        if (_PROG_FILES_X86)
-            set(_PROGFILESDIR "${_PROG_FILES_X86}")
-        else ()
-            set(_PROGFILESDIR "${_PROG_FILES}")
-        endif ()
-    endif ()
-    set (MATROX_DIR "${_PROGFILESDIR}/Matrox Imaging/Mil" CACHE PATH "Directory containing Matrox MIL SDK includes and libraries")
-endif ()
-
-find_path (MATROX_INCLUDE_DIR Mil.h
-    PATHS
-    "${MATROX_DIR}/Include"
-    DOC "Directory containing Matrox MIL include files")
-
-find_library (_MATROX_LIB NAMES Mil.lib
-    PATHS
-    "${MATROX_DIR}/LIB")
-
-
-set (MATROX_LIBRARIES ${_MATROX_LIB})
-
-mark_as_advanced (_MATROX_LIB)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (MATROX  DEFAULT_MSG  MATROX_INCLUDE_DIR MATROX_LIBRARIES)
diff --git a/cmake/modules/FindNIIMAQ.cmake b/cmake/modules/FindNIIMAQ.cmake
deleted file mode 100644
index 93179e6..0000000
--- a/cmake/modules/FindNIIMAQ.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-# - Try to find National Instruments IMAQ
-# Once done this will define
-#
-#  NIIMAQ_FOUND - system has NI-IMAQ
-#  NIIMAQ_INCLUDE_DIR - the NI-IMAQ include directory
-#  NIIMAQ_LIBRARIES - the libraries needed to use NI-IMAQ
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2014, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT NIIMAQ_DIR)
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    # 64-bit dir on win64
-    file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
-    
-	# NI puts 64-bit lib in 32-bit Program Files directory
-	if (_PROG_FILES_X86)
-		set(_PROGFILESDIR "${_PROG_FILES_X86}")
-	else ()
-		set(_PROGFILESDIR "${_PROG_FILES}")
-	endif ()
-
-    set(NIIMAQ_DIR "${_PROGFILESDIR}/National Instruments" CACHE PATH "Top level National Instruments directory")
-endif (NOT NIIMAQ_DIR)
-
-find_path(NIIMAQ_INCLUDE_DIR niimaq.h
-    PATHS
-    "${NIIMAQ_DIR}/Shared/ExternalCompilerSupport/C/Include"
-    DOC "Directory containing niimaq.h include file")
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	find_library(NIIMAQ_LIBRARIES NAMES imaq
-		PATHS
-		"${NIIMAQ_DIR}/Shared/ExternalCompilerSupport/C/Lib64/MSVC"
-		DOC "niimaq library to link with")
-else ()
-	find_library(NIIMAQ_LIBRARIES NAMES imaq
-		PATHS
-		"${NIIMAQ_DIR}/Shared/ExternalCompilerSupport/C/Lib32/MSVC"
-		DOC "niimaq library to link with")
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(NIIMAQ DEFAULT_MSG NIIMAQ_INCLUDE_DIR NIIMAQ_LIBRARIES)
-
-mark_as_advanced(NIIMAQ_INCLUDE_DIR NIIMAQ_LIBRARIES)
diff --git a/cmake/modules/FindNIIMAQdx.cmake b/cmake/modules/FindNIIMAQdx.cmake
deleted file mode 100644
index 6177cb6..0000000
--- a/cmake/modules/FindNIIMAQdx.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# - Try to find National Instruments IMAQdx
-# Once done this will define
-#
-#  NIIMAQDX_FOUND - system has NI-IMAQdx
-#  NIIMAQDX_INCLUDE_DIR - the NI-IMAQdx include directory
-#  NIIMAQDX_LIBRARIES - the libraries needed to use NI-IMAQdx
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2010, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT NIIMAQDX_DIR)
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    if (_PROG_FILES_X86)
-        set(_PROGFILESDIR "${_PROG_FILES_X86}")
-    else ()
-        set(_PROGFILESDIR "${_PROG_FILES}")
-    endif ()
-
-    set (NIIMAQDX_DIR "${_PROGFILESDIR}/National Instruments" CACHE PATH "Directory containing NI includes and libraries")
-endif ()
-
-find_path (NIIMAQDX_INCLUDE_DIR NIIMAQdx.h
-    PATHS
-    "${NIIMAQDX_DIR}/Shared/ExternalCompilerSupport/C/Include"
-    DOC "Directory containing NIIMAQdx.h include file")
-
-find_library (NIIMAQDX_LIBRARIES NAMES niimaqdx
-    PATHS
-    "${NIIMAQDX_DIR}/Shared/ExternalCompilerSupport/C/Lib32/MSVC"
-    DOC "NI-IMAQdx library to link with")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (NIIMAQDX  DEFAULT_MSG  NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)
-
-MARK_AS_ADVANCED(NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)
diff --git a/cmake/modules/FindOpenCV.cmake b/cmake/modules/FindOpenCV.cmake
deleted file mode 100644
index 8f57f2c..0000000
--- a/cmake/modules/FindOpenCV.cmake
+++ /dev/null
@@ -1,160 +0,0 @@
-###########################################################
-#                  Find OpenCV Library
-# See http://sourceforge.net/projects/opencvlibrary/
-#----------------------------------------------------------
-#
-## 1: Setup:
-# The following variables are optionally searched for defaults
-#  OpenCV_DIR:            Base directory of OpenCv tree to use.
-#
-## 2: Variable
-# The following are set after configuration is done:
-#
-#  OpenCV_FOUND
-#  OpenCV_LIBS
-#  OpenCV_INCLUDE_DIR
-#  OpenCV_VERSION (OpenCV_VERSION_MAJOR, OpenCV_VERSION_MINOR, OpenCV_VERSION_PATCH)
-#
-#
-# Deprecated variable are used to maintain backward compatibility with
-# the script of Jan Woetzel (2006/09): www.mip.informatik.uni-kiel.de/~jw
-#  OpenCV_INCLUDE_DIRS
-#  OpenCV_LIBRARIES
-#  OpenCV_LINK_DIRECTORIES
-#
-## 3: Version
-#
-# 2010/04/07 Benoit Rat, Correct a bug when OpenCVConfig.cmake is not found.
-# 2010/03/24 Benoit Rat, Add compatibility for when OpenCVConfig.cmake is not found.
-# 2010/03/22 Benoit Rat, Creation of the script.
-#
-#
-# tested with:
-# - OpenCV 2.1:  MinGW, MSVC2008
-# - OpenCV 2.0:  MinGW, MSVC2008, GCC4
-#
-#
-## 4: Licence:
-#
-# LGPL 2.1 : GNU Lesser General Public License Usage
-# Alternatively, this file may be used under the terms of the GNU Lesser
-
-# General Public License version 2.1 as published by the Free Software
-# Foundation and appearing in the file LICENSE.LGPL included in the
-# packaging of this file.  Please review the following information to
-# ensure the GNU Lesser General Public License version 2.1 requirements
-# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-#
-#----------------------------------------------------------
-
-
-find_path(OpenCV_DIR "OpenCVConfig.cmake" DOC "Root directory of OpenCV")
-
-##====================================================
-## Find OpenCV libraries
-##----------------------------------------------------
-if(EXISTS "${OpenCV_DIR}")
-
-        #When its possible to use the Config script use it.
-        if(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
-
-                ## Include the standard CMake script
-                include("${OpenCV_DIR}/OpenCVConfig.cmake")
-
-                ## Search for a specific version
-                set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
-
-        #Otherwise it try to guess it.
-        else(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
-
-                set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux)
-                find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "")
-                if(EXISTS  ${OpenCV_INCLUDE_DIR})
-                    include_directories(${OpenCV_INCLUDE_DIR})
-                endif(EXISTS  ${OpenCV_INCLUDE_DIR})
-
-                #Find OpenCV version by looking at cvver.h
-  file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
-  string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP})
-  string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP})
-  string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP})
-  set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE)
-  set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
-
-        endif(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
-
-
-
-
-        ## Initiate the variable before the loop
-        set(OpenCV_LIBS "")
-        set(OpenCV_FOUND_TMP TRUE)
-
-        ## Loop over each components
-        foreach(__CVLIB ${OPENCV_LIB_COMPONENTS})
-
-                find_library(OpenCV_${__CVLIB}_LIBRARY_DEBUG NAMES "${__CVLIB}${CVLIB_SUFFIX}d" "lib${__CVLIB}${CVLIB_SUFFIX}d" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH)
-                find_library(OpenCV_${__CVLIB}_LIBRARY_RELEASE NAMES "${__CVLIB}${CVLIB_SUFFIX}" "lib${__CVLIB}${CVLIB_SUFFIX}" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH)
-
-                #Remove the cache value
-                set(OpenCV_${__CVLIB}_LIBRARY "" CACHE STRING "" FORCE)
-
-                #both debug/release
-                if(OpenCV_${__CVLIB}_LIBRARY_DEBUG AND OpenCV_${__CVLIB}_LIBRARY_RELEASE)
-                        set(OpenCV_${__CVLIB}_LIBRARY debug ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} optimized ${OpenCV_${__CVLIB}_LIBRARY_RELEASE}  CACHE STRING "" FORCE)
-                #only debug
-                elseif(OpenCV_${__CVLIB}_LIBRARY_DEBUG)
-                        set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_DEBUG}  CACHE STRING "" FORCE)
-                #only release
-                elseif(OpenCV_${__CVLIB}_LIBRARY_RELEASE)
-                        set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_RELEASE}  CACHE STRING "" FORCE)
-                #no library found
-                else()
-                        set(OpenCV_FOUND_TMP FALSE)
-                endif()
-
-                #Add to the general list
-                if(OpenCV_${__CVLIB}_LIBRARY)
-                        set(OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_${__CVLIB}_LIBRARY})
-                endif(OpenCV_${__CVLIB}_LIBRARY)
-
-        endforeach(__CVLIB)
-
-
-        set(OpenCV_FOUND ${OpenCV_FOUND_TMP} CACHE BOOL "" FORCE)
-
-
-else(EXISTS "${OpenCV_DIR}")
-        set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable")
-endif(EXISTS "${OpenCV_DIR}")
-##====================================================
-
-
-##====================================================
-## Print message
-##----------------------------------------------------
-if(NOT OpenCV_FOUND)
-  # make FIND_PACKAGE friendly
-  if(NOT OpenCV_FIND_QUIETLY)
-        if(OpenCV_FIND_REQUIRED)
-          message(FATAL_ERROR "OpenCV required but some headers or libs not found. ${ERR_MSG}")
-        else(OpenCV_FIND_REQUIRED)
-          message(STATUS "WARNING: OpenCV was not found. ${ERR_MSG}")
-        endif(OpenCV_FIND_REQUIRED)
-  endif(NOT OpenCV_FIND_QUIETLY)
-endif(NOT OpenCV_FOUND)
-##====================================================
-
-
-##====================================================
-## Backward compatibility
-##----------------------------------------------------
-if(OpenCV_FOUND)
-option(OpenCV_BACKWARD_COMPA "Add some variable to make this script compatible with the other version of FindOpenCV.cmake" false)
-if(OpenCV_BACKWARD_COMPA)
-        find_path(OpenCV_INCLUDE_DIRS "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory")
-        find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory")
-        set(OpenCV_LIBRARIES "${OpenCV_LIBS}" CACHE STRING "" FORCE)
-endif(OpenCV_BACKWARD_COMPA)
-endif(OpenCV_FOUND)
-##====================================================
diff --git a/cmake/modules/FindOpenGL.cmake.off b/cmake/modules/FindOpenGL.cmake.off
deleted file mode 100644
index 3dc7dd2..0000000
--- a/cmake/modules/FindOpenGL.cmake.off
+++ /dev/null
@@ -1,30 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{OPENGL_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${OPENGL_DIR}" TRY2_DIR)
-FILE(GLOB OPENGL_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(OPENGL_gl_INCLUDE_DIR GL/gl.h
-                                PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include
-                                ENV INCLUDE DOC "Directory containing GL/gl.h include file")
-
-FIND_PATH(OPENGL_glu_INCLUDE_DIR GL/glu.h
-                                 PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include
-                                 ENV INCLUDE DOC "Directory containing GL/glu.h include file")
-
-FIND_LIBRARY(OPENGL_gl_LIBRARY NAMES opengl32 GL
-                               PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib
-                               ENV LIB
-                               DOC "gl library to link with"
-                               NO_SYSTEM_ENVIRONMENT_PATH)
-
-FIND_LIBRARY(OPENGL_glu_LIBRARY NAMES glu32 GLU
-                                PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib
-                                ENV LIB
-                                DOC "glu library to link with"
-                                NO_SYSTEM_ENVIRONMENT_PATH)
-
-IF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY)
-  SET(OPENGL_INCLUDE_DIR ${OPENGL_gl_INCLUDE_DIR} ${OPENGL_glu_INCLUDE_DIR})
-  list(REMOVE_DUPLICATES OPENGL_INCLUDE_DIR)
-  SET(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
-  list(REMOVE_DUPLICATES OPENGL_LIBRARIES)
-ENDIF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY)
diff --git a/cmake/modules/FindPhoenix.cmake b/cmake/modules/FindPhoenix.cmake
deleted file mode 100644
index 46ffa7b..0000000
--- a/cmake/modules/FindPhoenix.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# - Try to find Active Silicon Phoenix SDK
-# Once done this will define
-#
-#  PHOENIX_FOUND - system has Active Silicon Phoenix SDK
-#  PHOENIX_INCLUDE_DIR - the Active Silicon Phoenix SDK include directory
-#  PHOENIX_LIBRARIES - the libraries needed to use Active Silicon Phoenix SDK
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT PHOENIX_DIR)
-    set (PHOENIX_DIR "C:/Program Files (x86)/Active Silicon/Phoenix/Win/SDK6.30" CACHE PATH "Directory containing Phoenix SDK includes and libraries")
-endif ()
-
-find_path(PHOENIX_INCLUDE_DIR phx_api.h
-    PATHS
-    "${PHOENIX_DIR}/Include"
-    DOC "Directory containing phx_api.h include file")
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	find_library(PHOENIX_LIBRARIES NAMES phxlx64
-		PATHS
-		"${PHOENIX_DIR}/Lib/win64"
-		DOC "PHOENIX library to link with")
-else ()
-	find_library(PHOENIX_LIBRARIES NAMES phxlw32
-		PATHS
-		"${PHOENIX_DIR}/Lib/win32"
-		DOC "PHOENIX library to link with")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PHOENIX  DEFAULT_MSG  PHOENIX_INCLUDE_DIR PHOENIX_LIBRARIES)
diff --git a/cmake/modules/FindPleora.cmake b/cmake/modules/FindPleora.cmake
deleted file mode 100644
index d37969b..0000000
--- a/cmake/modules/FindPleora.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# - Try to find Pleora SDK
-# Once done this will define
-#
-#  Pleora_FOUND - system has Pleora SDK
-#  Pleora_INCLUDE_DIR - the Pleora SDK include directory
-#  Pleora_LIBRARIES - the Pleora SDK libraries
-#  Pleora_LIBRARY_DIR - the Pleora SDK library directory
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2019 outside US, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT Pleora_DIR)
-    set (Pleora_DIR $ENV{PUREGEV_ROOT} CACHE PATH "Directory containing Pleora SDK includes and libraries")
-endif ()
-
-if (WIN32 AND CMAKE_SIZEOF_VOID_P MATCHES "8")
-    set(_LIB_SUFFIX "64")
-else ()
-    set(_LIB_SUFFIX "")
-endif ()
-
-set (_Pleora_PATHS PATHS
-  "${Pleora_DIR}"
-  "C:/Program Files/Pleora Technologies Inc/eBUS SDK"
-  "C:/Program Files (x86)/Pleora Technologies Inc/eBUS SDK")
-
-find_path (Pleora_INCLUDE_DIR PvBase.h
-    PATHS ${_Pleora_PATHS}
-    PATH_SUFFIXES Includes include)
-message (STATUS "Found Pleora include dir in ${Pleora_INCLUDE_DIR}")
-
-find_path (Pleora_LIBRARY_DIR NAMES libPvBase.so "PvBase${_LIB_SUFFIX}.lib"
-    PATHS ${_Pleora_PATHS}
-    PATH_SUFFIXES Libraries lib)
-
-message (STATUS "Found Pleora library in ${Pleora_LIBRARY_DIR}")
-
-find_library (Pleora_LIBRARY_BASE "PvBase${_LIB_SUFFIX}" ${Pleora_LIBRARY_DIR})
-find_library (Pleora_LIBRARY_DEVICE "PvDevice${_LIB_SUFFIX}" ${Pleora_LIBRARY_DIR})
-find_library (Pleora_LIBRARY_PERSISTENCE "PvPersistence${_LIB_SUFFIX}" ${Pleora_LIBRARY_DIR})
-find_library (Pleora_LIBRARY_VIRTUAL_DEVICE "PvVirtualDevice${_LIB_SUFFIX}" ${Pleora_LIBRARY_DIR})
-
-set (Pleora_LIBRARIES ${Pleora_LIBRARY_BASE} ${Pleora_LIBRARY_DEVICE} ${Pleora_LIBRARY_PERSISTENCE} ${Pleora_LIBRARY_VIRTUAL_DEVICE})
-
-if (Pleora_INCLUDE_DIR)
-  file(STRINGS "${Pleora_INCLUDE_DIR}/PvVersion.h" _pleora_VERSION_CONTENTS REGEX "#define NVERSION_STRING")
-  if ("${_pleora_VERSION_CONTENTS}" MATCHES "#define NVERSION_STRING[ \t]+\"([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)+")
-    set(Pleora_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    set(Pleora_VERSION_MINOR "${CMAKE_MATCH_2}")
-    set(Pleora_VERSION_PATCH "${CMAKE_MATCH_3}")
-    set(Pleora_VERSION_TWEAK "${CMAKE_MATCH_4}")
-    set(Pleora_VERSION_COUNT 4)
-    set(Pleora_VERSION_STRING "${Pleora_VERSION_MAJOR}.${Pleora_VERSION_MINOR}.${Pleora_VERSION_PATCH}.${Pleora_VERSION_TWEAK}")
-    set(Pleora_VERSION ${Pleora_VERSION_STRING})
-    message(STATUS "Found Pleora version: ${Pleora_VERSION_STRING}")
-  endif ()
-endif ()
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Pleora
-  REQUIRED_VARS Pleora_INCLUDE_DIR Pleora_LIBRARY_DIR Pleora_LIBRARIES
-  VERSION_VAR Pleora_VERSION_STRING)
diff --git a/cmake/modules/FindPylon.cmake b/cmake/modules/FindPylon.cmake
deleted file mode 100644
index cd94154..0000000
--- a/cmake/modules/FindPylon.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find Pylon SDK
-# Once done this will define
-#
-#  PYLON_FOUND - system has Pylon SDK
-#  PYLON_INCLUDE_DIR - the Pylon SDK include directory
-#  PYLON_LIBRARIES - the libraries needed to use Pylon SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT PYLON_DIR)
-  if (WIN32)
-    set (_PYLON_DIR "C:/Program Files/Basler/pylon 5")
-  else ()
-    set (_PYLON_DIR "/opt/pylon5")
-  endif ()
-  set (PYLON_DIR ${_PYLON_DIR} CACHE PATH "Directory containing Pylon SDK includes and libraries")
-endif ()
-
-find_path (PYLON_INCLUDE_DIR pylonc/PylonC.h
-    PATHS
-    "${PYLON_DIR}/Development/include"
-    "${PYLON_DIR}/include"
-    DOC "Directory containing PylonC.h include file")
-
-# TODO: support multiple SDK versions
-find_library (_PylonCLib NAMES PylonC_MD_VC120 pylonc
-    PATHS
-    "${PYLON_DIR}/Development/lib/x64"
-    "${PYLON_DIR}/lib64"
-    "${PYLON_DIR}/lib"
-    )
-
-set (PYLON_LIBRARIES ${_PylonCLib})
-
-mark_as_advanced (_PylonCLib)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (PYLON  DEFAULT_MSG  PYLON_INCLUDE_DIR PYLON_LIBRARIES)
diff --git a/cmake/modules/FindQCam.cmake b/cmake/modules/FindQCam.cmake
deleted file mode 100644
index e0af63d..0000000
--- a/cmake/modules/FindQCam.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# - Try to find QCam SDK
-# Once done this will define
-#
-#  QCAM_FOUND - system has QCam SDK
-#  QCAM_INCLUDE_DIR - the QCam SDK include directory
-#  QCAM_LIBRARIES - the libraries needed to use QCam SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-# Copyright (c) 2021 outside US, United States Government, Joshua M. Doe <oss@nvl.army.mil>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT QCAM_DIR)
-    set (QCAM_DIR "C:/Program Files/QImaging/SDK" CACHE PATH "Directory containing QCam SDK includes and libraries")
-endif ()
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    set(_LIB_NAME "QCamDriverx64")
-else ()
-    set(_LIB_NAME "QCamDriver")
-endif ()
-
-find_path (QCAM_INCLUDE_DIR QCamApi.h
-    PATHS
-    "${QCAM_DIR}/Headers"
-    DOC "Directory containing QCam API include files")
-
-find_library (QCAM_LIBRARIES NAMES ${_LIB_NAME}
-    PATHS
-    "${QCAM_DIR}/libs/AMD64" "${QCAM_DIR}/libs/i386")
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (QCAM  DEFAULT_MSG  QCAM_INCLUDE_DIR QCAM_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/modules/FindSapera.cmake b/cmake/modules/FindSapera.cmake
deleted file mode 100644
index 77de12c..0000000
--- a/cmake/modules/FindSapera.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# - Try to find Sapera SDK
-# Once done this will define
-#
-#  SAPERA_FOUND - system has Sapera SDK
-#  SAPERA_INCLUDE_DIR - the Sapera SDK include directory
-#  SAPERA_LIBRARIES - the libraries needed to use the Sapera SDK
-
-# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-if (NOT SAPERA_DIR)
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    # 64-bit dir on win64
-    file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
-    if (_PROG_FILES_X86)
-        set(_PROGFILESDIR "${_PROG_FILES_W6432}")
-    else ()
-        set(_PROGFILESDIR "${_PROG_FILES}")
-    endif ()
-
-    set (SAPERA_DIR "${_PROGFILESDIR}/Teledyne DALSA/Sapera" CACHE PATH "Directory containing NI includes and libraries")
-endif ()
-
-find_path(SAPERA_PLUS_PLUS_INCLUDE_DIR SapClassBasic.h
-    PATHS
-    "${SAPERA_DIR}/Classes/Basic"
-    DOC "Directory containing Sapera include files")
-	
-find_path(SAPERA_C_INCLUDE_DIR corapi.h
-    PATHS
-    "${SAPERA_DIR}/Include"
-    DOC "Directory containing Sapera include files")
-
-set (SAPERA_INCLUDE_DIR ${SAPERA_PLUS_PLUS_INCLUDE_DIR} ${SAPERA_C_INCLUDE_DIR})
-	
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	find_library(SAPERA_LIBRARIES NAMES SapClassBasic
-		PATHS
-		"${SAPERA_DIR}/Lib/Win64"
-		DOC "Sapera library to link with")
-else ()
-	find_library(SAPERA_LIBRARIES NAMES SapClassBasic
-		PATHS
-		"${SAPERA_DIR}/Lib/Win32"
-		DOC "Sapera library to link with")
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SAPERA DEFAULT_MSG SAPERA_INCLUDE_DIR SAPERA_LIBRARIES)
diff --git a/cmake/modules/FindXCLIB.cmake b/cmake/modules/FindXCLIB.cmake
deleted file mode 100644
index fa075bd..0000000
--- a/cmake/modules/FindXCLIB.cmake
+++ /dev/null
@@ -1,67 +0,0 @@
-# - Try to find EPIX XCLIB
-# Once done this will define
-#
-#  XCLIB_FOUND - system has EPIX XCLIB
-#  XCLIB_INCLUDE_DIR - the EPIX XCLIB include directory
-#  XCLIB_LIBRARIES - the libraries needed to use EPIX XCLIB
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# TODO: properly handle Linux
-
-if (NOT XCLIB_DIR)
-    # 32-bit dir on win32
-    file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
-    # 32-bit dir on win64
-    set(_PROG_FILES_X86 "ProgramFiles(x86)")
-    file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
-    # 64-bit dir on win64
-    file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
-    
-    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        set(_PROGFILESDIR "${_PROG_FILES_W6432}")
-    else ()
-        if (_PROG_FILES_X86)
-            set(_PROGFILESDIR "${_PROG_FILES_X86}")
-        else ()
-            set(_PROGFILESDIR "${_PROG_FILES}")
-        endif ()
-    endif ()
-
-    set (XCLIB_DIR "${_PROGFILESDIR}/EPIX/XCLIB" CACHE PATH "Directory containing EPIX PIXCI XCLIB includes and libraries")
-endif (NOT XCLIB_DIR)
-
-find_path (XCLIB_INCLUDE_DIR xcliball.h
-    PATHS
-    "${XCLIB_DIR}"
-    DOC "Directory containing xcliball.h include file")
-
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    find_library (XCLIB_LIBRARIES NAMES XCLIBW64
-        PATHS
-        "${XCLIB_DIR}"
-        DOC "XCLIB 64-bit library to link with")
-else ()
-    find_library (XCLIB_LIBRARIES NAMES XCLIBWNT
-        PATHS
-        "${XCLIB_DIR}"
-        DOC "XCLIB 32-bit library to link with")
-endif ()
-
-if (XCLIB_INCLUDE_DIR)
-   #message(STATUS "DEBUG: Found EPIX XCLIB include dir: ${XCLIB_INCLUDE_DIR}")
-else (XCLIB_INCLUDE_DIR)
-   message(STATUS "XCLIB: WARNING: include dir not found")
-endif (XCLIB_INCLUDE_DIR)
-
-if (XCLIB_LIBRARIES)
-   #message(STATUS "DEBUG: Found EPIX XCLIB library: ${XCLIB_LIBRARIES}")
-else (XCLIB_LIBRARIES)
-   message(STATUS "XCLIB: WARNING: library not found")
-endif (XCLIB_LIBRARIES)
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (XCLIB  DEFAULT_MSG  XCLIB_INCLUDE_DIR XCLIB_LIBRARIES)
-
-mark_as_advanced(XCLIB_INCLUDE_DIR XCLIB_LIBRARIES)
diff --git a/gst/CMakeLists.txt b/gst/CMakeLists.txt
index 1fbbb5e..eb08a28 100644
--- a/gst/CMakeLists.txt
+++ b/gst/CMakeLists.txt
@@ -4,7 +4,12 @@ endif (OPENCV_FOUND)
 
 add_subdirectory (bayerutils)
 add_subdirectory (extractcolor)
-add_subdirectory (intervalometer)
+
+# Only build intervalometer if IDS uEye SDK is available
+if (IDSUEYE_FOUND)
+  add_subdirectory (intervalometer)
+endif (IDSUEYE_FOUND)
+
 add_subdirectory (linescan)
 
 if (ENABLE_KLV)
diff --git a/gst/intervalometer/gstintervalometer.h b/gst/intervalometer/gstintervalometer.h
index f46fbe6..e65d835 100644
--- a/gst/intervalometer/gstintervalometer.h
+++ b/gst/intervalometer/gstintervalometer.h
@@ -25,7 +25,7 @@
 #include <gst/video/video.h>
 
 #define _PURE_C
-#include "../../sys/idsueye/include/ueye.h"
+#include "../../sys/idsueye/include/uEye.h"
 
 G_BEGIN_DECLS
 
diff --git a/sys/idsueye/gstidsueyesrc.h b/sys/idsueye/gstidsueyesrc.h
index eefe8d3..afb13da 100644
--- a/sys/idsueye/gstidsueyesrc.h
+++ b/sys/idsueye/gstidsueyesrc.h
@@ -23,7 +23,7 @@
 #include <gst/base/gstpushsrc.h>
 
 #define _PURE_C
-#include "ueye.h"
+#include "uEye.h"
 
 G_BEGIN_DECLS