diff --git a/DeviceAdapters/Zaber/Zaber.vcxproj b/DeviceAdapters/Zaber/Zaber.vcxproj
index 72f0eed03..b485aec5c 100644
--- a/DeviceAdapters/Zaber/Zaber.vcxproj
+++ b/DeviceAdapters/Zaber/Zaber.vcxproj
@@ -59,13 +59,13 @@
true
true
WIN32;_USRDLL;_WINDOWS;%(PreprocessorDefinitions)
- $(MM_3RDPARTYPUBLIC)\Zaber\zaber-motion\include;%(AdditionalIncludeDirectories)
+ $(MM_3RDPARTYPUBLIC)\Zaber\zaber-motion-3.4.4\include;%(AdditionalIncludeDirectories)
true
true
zml.lib;%(AdditionalDependencies)
- $(MM_3RDPARTYPUBLIC)\Zaber\zaber-motion\win64\lib;%(AdditionalLibraryDirectories)
+ $(MM_3RDPARTYPUBLIC)\Zaber\zaber-motion-3.4.4\win64\lib;%(AdditionalLibraryDirectories)
diff --git a/DeviceAdapters/configure.ac b/DeviceAdapters/configure.ac
index b8aa8712e..af0e239db 100644
--- a/DeviceAdapters/configure.ac
+++ b/DeviceAdapters/configure.ac
@@ -431,24 +431,26 @@ AS_IF([test "x$want_vimba_x" != xno],
AM_CONDITIONAL([BUILD_ALLIED_VISION_CAMERA], [test "x$use_vimba_x" = xyes])
# Zaber Motion Library (hack: only support 3rdpartypublic copy currently)
+zml_version="3.4.4"
+zml_so_version="3.4"
AC_MSG_CHECKING([for Zaber Motion Library in 3rdpartypublic])
-zml_header_to_check="${thirdpartypublic}/Zaber/zaber-motion/include/zaber/motion/library.h"
+zml_header_to_check="${thirdpartypublic}/Zaber/zaber-motion-${zml_version}/include/zaber/motion/library.h"
AM_CONDITIONAL([BUILD_ZABER], [test -f $zml_header_to_check])
if test -f "$zml_header_to_check"; then
AC_MSG_RESULT([found])
- ZML_CPPFLAGS="-I${thirdpartypublic}/Zaber/zaber-motion/include"
+ ZML_CPPFLAGS="-I${thirdpartypublic}/Zaber/zaber-motion-${zml_version}/include"
ZML_LIBS="-lzml"
case $host in
*linux*)
# Linux builds by users should install ZML libs
- zml_linux_libdir="${thirdpartypublic}/Zaber/zaber-motion/linux-amd64/lib"
+ zml_linux_libdir="${thirdpartypublic}/Zaber/zaber-motion-${zml_version}/linux-amd64/lib"
ZML_LDFLAGS="-L${zml_linux_libdir} -Wl,-rpath,"'\$$ORIGIN'
- ZML_LIBS_TO_COPY="${zml_linux_libdir}/libzml.so.3.4 ${zml_linux_libdir}/libzaber-motion-lib-linux-amd64.so.3.4.4"
+ ZML_LIBS_TO_COPY="${zml_linux_libdir}/libzml.so.${zml_so_version} ${zml_linux_libdir}/libzaber-motion-lib-linux-amd64.so.${zml_version}"
;;
*apple-darwin*)
# macOS build for packaging does not ship ZML
- ZML_LDFLAGS="-L${thirdpartypublic}/Zaber/zaber-motion/darwin/lib"
+ ZML_LDFLAGS="-L${thirdpartypublic}/Zaber/zaber-motion-${zml_version}/darwin/lib"
ZML_LIBS_TO_COPY=""
;;
esac