Remove vcpkg helper

.github/workflows/ci.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Build with CMake Presets
         shell: bash
         run: |
-          export VCPKG_ROOT=${GITHUB_WORKSPACE}/${VCPKG_ROOT_PART}
+          export CMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/${VCPKG_ROOT_PART}/scripts/buildsystems/vcpkg.cmake
           export INSTALL_DIR=${GITHUB_WORKSPACE}/${INSTALL_DIR_PART}
           scripts/build-preset.sh debug
         env:

CMakeLists.txt

@@ -9,7 +9,6 @@
 cmake_minimum_required(VERSION 3.21)
 
 include("cmake/options.cmake")
-include("cmake/vcpkg_helper.cmake")
 
 project(rellic)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden) 

CMakePresets.json

@@ -60,10 +60,8 @@
           "generator": "Ninja",
           "cacheVariables": {
               "VCPKG_TARGET_TRIPLET": "$env{VCPKG_TARGET_TRIPLET}",
-              "VCPKG_ROOT": "$env{VCPKG_ROOT}",
+              "CMAKE_TOOLCHAIN_FILE": "$env{CMAKE_TOOLCHAIN_FILE}"
               "CMAKE_INSTALL_PREFIX": "$env{INSTALL_DIR}/install",
-              "CMAKE_C_COMPILER": "$env{VCPKG_ROOT}/installed/$env{VCPKG_TARGET_TRIPLET}/tools/llvm/clang",
-              "CMAKE_CXX_COMPILER": "$env{VCPKG_ROOT}/installed/$env{VCPKG_TARGET_TRIPLET}/tools/llvm/clang++",
               "RELLIC_ENABLE_TESTING": "ON"
           }
         },
@@ -86,37 +84,37 @@
             "name": "vcpkg-x64-dbg",
             "inherits": ["vcpkg-debug", "x86_64"],
             "displayName": "Debug Build (vcpkg) (x64)",
-            "description": "Build a Debug version against a VCPKG installation. Define 'VCPKG_ROOT', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
+            "description": "Build a Debug version against a VCPKG installation. Define 'CMAKE_TOOLCHAIN_FILE', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
         },
         {
             "name": "vcpkg-x64-rel",
             "inherits": ["vcpkg-release", "x86_64"],
             "displayName": "Release Build (vcpkg) (x64)",
-            "description": "Build a Release version against a VCPKG installation. Define 'VCPKG_ROOT', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
+            "description": "Build a Release version against a VCPKG installation. Define 'CMAKE_TOOLCHAIN_FILE', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
         },
         {
             "name": "vcpkg-x64-asan",
             "inherits": ["vcpkg-asan", "x86_64"],
             "displayName": "Debug ASAN Build (vcpkg) (x64)",
-            "description": "Build a Debug ASAN version against a VCPKG installation. Define 'VCPKG_ROOT', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
+            "description": "Build a Debug ASAN version against a VCPKG installation. Define 'CMAKE_TOOLCHAIN_FILE', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
         },
         {
             "name": "vcpkg-arm64-dbg",
             "inherits": ["vcpkg-debug", "arm64"],
             "displayName": "Debug Build (vcpkg) (arm64)",
-            "description": "Build a Debug version against a VCPKG installation. Define 'VCPKG_ROOT', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
+            "description": "Build a Debug version against a VCPKG installation. Define 'CMAKE_TOOLCHAIN_FILE', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
         },
         {
             "name": "vcpkg-arm64-rel",
             "inherits": ["vcpkg-release", "arm64"],
             "displayName": "Release Build (vcpkg) (arm64)",
-            "description": "Build a Release version against a VCPKG installation. Define 'VCPKG_ROOT', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
+            "description": "Build a Release version against a VCPKG installation. Define 'CMAKE_TOOLCHAIN_FILE', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
         },
         {
             "name": "vcpkg-arm64-asan",
             "inherits": ["vcpkg-asan", "arm64"],
             "displayName": "Debug ASAN Build (vcpkg) (arm64)",
-            "description": "Build a Debug ASAN version against a VCPKG installation. Define 'VCPKG_ROOT', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
+            "description": "Build a Debug ASAN version against a VCPKG installation. Define 'CMAKE_TOOLCHAIN_FILE', 'INSTALL_DIR', 'VCPKG_TARGET_TRIPLET' env vars!"
         }
     ],
     "buildPresets": [

README.md

@@ -95,7 +95,7 @@ Make sure to have the latest release of cxx-common for LLVM 14. Then, build with
 ```shell
 cmake \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  -DVCPKG_ROOT=/path/to/vcpkg \
+  -DCMAKE_TOOLCHAIN_FILE=/path/to/cmake/toolchain \
   -DVCPKG_TARGET_TRIPLET=x64-osx-rel \
   -DRELLIC_ENABLE_TESTING=OFF \
   -DCMAKE_C_COMPILER=`which clang` \

scripts/build-preset.sh

@@ -11,11 +11,11 @@ VCPKG_SUFFIX="-rel"
 set -o pipefail
 
 function sanity_check {
-	if [ -z "${VCPKG_ROOT}" ]; then
-		echo "Please set the VCPKG_ROOT environment variable to the VCPKG root to build against"
+  	if [ -z "${CMAKE_TOOLCHAIN_FILE}" ]; then
+		echo "Please set the CMAKE_TOOLCHAIN_FILE environment variable to the CMake toolchain file to build against"
 		exit 1
 	else
-		echo "Building against VCPKG: [${VCPKG_ROOT}]"
+                echo "Building against CMake toolchain file: [${CMAKE_TOOLCHAIN_FILE}]"
 	fi
 
 	if [ -z "${INSTALL_DIR}" ]; then
@@ -36,22 +36,11 @@ function show_usage {
   printf "\tArguments after '--' are passed to CMake during configuration (e.g. -DCMAKE_C_COMPILER=foo)\n"
   printf "\n"
   printf "INSTALL_DIR set to [${INSTALL_DIR}]\n"
-  printf "VCPKG_ROOT set to [${VCPKG_ROOT}]\n"
+  printf "CMAKE_TOOLCHAIN_FILE set to [${CMAKE_TOOLCHAIN_FILE}]\n"
 
   return 0
 }
 
-function compiler_check {
-  printf "Checking for clang/clang++ in [${VCPKG_ROOT}] [${VCPKG_TARGET_TRIPLET}]:\n"
-  for c in ${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/llvm/{clang,clang++}
-  do
-    ver=$(${c} --version)
-    printf "Found a clang [${c}]:\n"
-    printf "${ver}\n"
-  done
-  printf "\n"
-}
-
 function set_arch {
   local arch=$(uname -m)
   case ${arch} in
@@ -135,9 +124,6 @@ ARCH=$(set_arch)
 OS=$(set_os)
 export VCPKG_TARGET_TRIPLET=${ARCH}-${OS}${VCPKG_SUFFIX}
 
-compiler_check
-
-
 echo "Configuring [${BUILD_TYPE}] [${ARCH}] against vcpkg [${VCPKG_TARGET_TRIPLET}]..."
 if [[ "${@}" != "" ]]
 then

scripts/build.sh

@@ -233,9 +233,9 @@ function Configure
     set -x
     cmake \
         -G Ninja \
+        -DCMAKE_TOOLCHAIN_FILE="${DOWNLOAD_DIR}/${LIBRARY_VERSION}/scripts/buildsystems/vcpkg.cmake" \
         -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
         -DCMAKE_VERBOSE_MAKEFILE=True \
-        -DVCPKG_ROOT="${DOWNLOAD_DIR}/${LIBRARY_VERSION}" \
         ${BUILD_FLAGS} \
         "${SRC_DIR}"
   ) || exit $?