4 files changed, 24 insertions, 10 deletions
diff --git a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile
index d608ef4c4..12e198139 100644
--- a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
 # please follow docker best practices
 # https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
 
@@ -36,7 +38,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
     # This commit uses Boost 1.75 and libusb 1.0.24
     git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
     bootstrap-vcpkg.bat
+    # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
 RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
-    libusb:x64-windows \
-    boost:x64-windows
-
+    libusb:uhd-x64-windows-static-md \
+    boost:uhd-x64-windows-static-md
diff --git a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile
index f4cb509fe..6ef77132d 100644
--- a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
 # please follow docker best practices
 # https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
 
@@ -36,6 +38,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
     # This commit uses Boost 1.75 and libusb 1.0.24
     git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
     bootstrap-vcpkg.bat
+    # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
 RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
-    libusb:x86-windows \
-    boost:x86-windows
+    libusb:uhd-x86-windows-static-md \
+    boost:uhd-x86-windows-static-md
diff --git a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile
index eb8aedcf6..d10b87cac 100644
--- a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
 # please follow docker best practices
 # https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
 
@@ -35,7 +37,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
     # This commit uses Boost 1.75 and libusb 1.0.24
     git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
     bootstrap-vcpkg.bat
+    # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
 RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
-    libusb:x64-windows \
-    boost:x64-windows
-
+    libusb:uhd-x64-windows-static-md \
+    boost:uhd-x64-windows-static-md
diff --git a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile
index 92afa8214..87806af1e 100644
--- a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
 # please follow docker best practices
 # https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
 
@@ -35,6 +37,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
     # This commit uses Boost 1.75 and libusb 1.0.24
     git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
     bootstrap-vcpkg.bat
+    # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
 RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
-    libusb:x86-windows \
-    boost:x86-windows
+    libusb:uhd-x86-windows-static-md \
+    boost:uhd-x86-windows-static-md