Merge pull request #16878 from GordonSmith/HPCC-28637-REMOVE_VCPKG_NOT

HPCC-28637 Revert the removal of vcpkg Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Jan 23, 2023 · 46123ba · 46123ba
2 parents 758681d + 9aea98d
commit 46123ba
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,20 +77,13 @@ set(CMAKE_TOOLCHAIN_FILE ${HPCC_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cma
 set(VCPKG_ROOT ${HPCC_SOURCE_DIR}/vcpkg)
 set(VCPKG_OVERLAY_PORTS ${HPCC_SOURCE_DIR}/vcpkg/overlays)
 set(VCPKG_INSTALLED_DIR "${VCPKG_FILES_DIR}/vcpkg_installed")
-set(VCPKG_INSTALL_OPTIONS "--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages")
+set(VCPKG_INSTALL_OPTIONS "--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages;--x-abi-tools-use-exact-versions")
 set(VCPKG_VERBOSE OFF)
-file(REMOVE ${HPCC_SOURCE_DIR}/vcpkg/vcpkg)
 if(APPLE OR WIN32)
 elseif(UNIX)
     set(VCPKG_TARGET_TRIPLET "x64-linux-dynamic" CACHE STRING "target triplet" FORCE)
 endif()
 
-if (UNIX)
-    file(REMOVE ${HPCC_SOURCE_DIR}/vcpkg/vcpkg)
-else()
-    file(REMOVE ${HPCC_SOURCE_DIR}/vcpkg/vcpkg.exe)
-endif()
-
 project(hpccsystems-platform LANGUAGES C CXX
     VERSION ${HPCC_MAJOR}.${HPCC_MINOR}.${HPCC_POINT}.${HPCC_SEQUENCE}
 )