Fix up vpckg install command

Signed-off-by: Jonathan Swartz <[email protected]>
AcademySoftwareFoundation · Aug 28, 2024 · fc1f3fb · fc1f3fb
1 parent 39b5ecc
commit fc1f3fb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ci/install_windows.sh b/ci/install_windows.sh
@@ -4,8 +4,7 @@ set -x
 set -e
 
 # Required dependencies
-VCPKG_INSTALL_CMD="vcpkg install
-    zlib
+VCPKG_INSTALL_CMD="zlib
     libpng
     openexr
     tbb
@@ -22,12 +21,13 @@ VCPKG_INSTALL_CMD="vcpkg install
     pybind11
     lz4"
 
-# if VCPKG_DEFAULT_TRIPLET ends with -static, then add ':x64-windows-static' to all the dependencies
+# if VCPKG_DEFAULT_TRIPLET ends with -static, then add ':x64-windows-static' to each word in the dependencies
 if [[ $VCPKG_DEFAULT_TRIPLET == *"-static" ]]; then
-    VCPKG_INSTALL_CMD="$VCPKG_INSTALL_CMD:x64-windows-static"
+    VCPKG_INSTALL_CMD=$(echo $VCPKG_INSTALL_CMD | sed 's/\S\+/\0:x64-windows-static/g')
 fi
 
-VCPKG_INSTALL_CMD="$VCPKG_INSTALL_CMD  --clean-after-build"
+
+VCPKG_INSTALL_CMD="vcpkg install $VCPKG_INSTALL_CMD  --clean-after-build"
 
 # Update vcpkg
 vcpkg update