add vcpkg

.devcontainer/Dockerfile

@@ -53,6 +53,10 @@ RUN apt install --yes \
         libxrandr-dev \
         wget
 
+# vcpkg
+RUN apt install --yes \
+        curl zip unzip tar
+
 # work arround as there is no debug version available
 RUN cp /lib/x86_64-linux-gnu/libcpptest.so /lib/x86_64-linux-gnu/libcpptestd.so
 
@@ -76,3 +80,9 @@ RUN groupadd --gid $USER_GID $USERNAME \
     && chmod 0440 /etc/sudoers.d/$USERNAME
 
 USER $USERNAME
+
+ENV VCPKG_ROOT="/home/$USERNAME/vcpkg"
+ENV PATH="$PATH:$VCPKG_ROOT"
+
+RUN git clone https://github.com/microsoft/vcpkg.git $VCPKG_ROOT
+RUN $VCPKG_ROOT/bootstrap-vcpkg.sh --disableMetrics

.github/workflows/ci-nel.yml

@@ -5,7 +5,6 @@ on:
     branches: [ "core4", "feature/*" ]
     paths:
       - .github/workflows/ci-nel.yml
-      - cmake/CMakePresets.nel.json
       - nel/**
       - CMakeLists.txt
       - CMakePresets.txt
@@ -14,7 +13,6 @@ on:
     branches: [ "core4" ]
     paths:
       - .github/workflows/ci-nel.yml
-      - cmake/CMakePresets.nel.json
       - nel/**
       - CMakeLists.txt
       - CMakePresets.txt

CMakePresets.json

@@ -2,7 +2,7 @@
   "version": 6,
   "include": [
     "cmake/CMakePresets.base.json",
-    "cmake/CMakePresets.nel.json",
+    "nel/CMakePresets.json",
     "cmake/CMakePresets.nelns.json",
     "snowballs2/CMakePresets.json"
   ]

cmake/CMakePresets.base.json

@@ -30,6 +30,12 @@
         "WITH_LIBGSF": true
       }
     },
+    {
+      "name": "vcpkg",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+      }
+    },
     {
       "inherits": [
         "default"

cmake/CMakePresets.nel.json → nel/CMakePresets.json

@@ -1,8 +1,8 @@
 {
   "version": 6,
   "include": [
-    "CMakePresets.base.json",
-    "CMakePresets.os.json"
+    "../cmake/CMakePresets.base.json",
+    "../cmake/CMakePresets.os.json"
   ],
   "configurePresets": [
     {
@@ -31,6 +31,7 @@
     {
       "inherits": [
         "linux",
+        "vcpkg",
         "nel"
       ],
       "name": "linux-nel"

vcpkg-configuration.json

@@ -0,0 +1,14 @@
+{
+  "default-registry": {
+    "kind": "git",
+    "baseline": "47bf3d1ac192b3fa0feb6e6ac9c845de179eebe9",
+    "repository": "https://github.com/microsoft/vcpkg"
+  },
+  "registries": [
+    {
+      "kind": "artifact",
+      "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
+      "name": "microsoft"
+    }
+  ]
+}

vcpkg.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": [
+    "gtest",
+    "openssl"
+  ]
+}