Merge pull request #17871 from GordonSmith/HPCC-30441-IMAGE_SH_VCPKG_…

…OVERLAYS HPCC-30441 image.sh unable to install Local vcpkg_overlays Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Oct 10, 2023 · 0ec6de0 · 0ec6de0
2 parents d005dfb + ac2b4f9
commit 0ec6de0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/dockerfiles/image.sh b/dockerfiles/image.sh
@@ -26,7 +26,7 @@ globals() {
     popd
     DOCKER_USERNAME="${DOCKER_USERNAME:-hpccbuilds}"
 
-    CMAKE_OPTIONS="-G Ninja -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=$(docker info --format '{{.NCPU}}') -DUSE_OPTIONAL=OFF -DCONTAINERIZED=ON -DINCLUDE_PLUGINS=ON -DSUPPRESS_V8EMBED=ON"
+    CMAKE_OPTIONS="-G Ninja -DCPACK_THREADS=$(docker info --format '{{.NCPU}}') -DUSE_OPTIONAL=OFF -DCONTAINERIZED=ON -DINCLUDE_PLUGINS=ON -DSUPPRESS_V8EMBED=ON"
 
     if [ "$TAG_BUILD" -eq 1 ]; then
         HPCC_BUILD="hpcc_build_$MODE-$GIT_BRANCH"
@@ -189,6 +189,7 @@ reconfigure() {
 configure() {
     local options=$1
     echo "--- cmake config $options ---"
+    run "cp -r -n /hpcc-dev/vcpkg_installed /hpcc-dev/build/vcpkg_installed"
     run "cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build $options"
 }