ide|ci: update build configuration

3 files changed, 43 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cb0d99..69591bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,19 +7,18 @@ default:
 
 build-and-test:
   stage: build
-  variables:
-    CMAKE_INSTALL_PREFIX: "ch.arknet.Turns"
-  script:
+  before_script:
     - weston --no-config --socket=$WAYLAND_DISPLAY --backend=headless &
-    - export XDG_DATA_DIRS=$(pwd)/${CMAKE_INSTALL_PREFIX}/share:${XDG_DATA_DIRS}
-    - cmake --preset default
-    - cmake --build --preset default --config $BUILD_TYPE
+    - export XDG_DATA_DIRS=$(pwd)/ch.arknet.Turns/share:${XDG_DATA_DIRS}
+  script:
+    - cmake --preset ci
+    - cmake --build --preset ci --config $BUILD_TYPE
     - cmake --install build --config $BUILD_TYPE
-    - glib-compile-schemas ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas
-    - dbus-run-session -- ctest --preset default --build-config $BUILD_TYPE
+    - glib-compile-schemas ch.arknet.Turns/share/glib-2.0/schemas
+    - dbus-run-session -- ctest --preset ci --build-config $BUILD_TYPE
   artifacts:
     paths:
-      - ${CMAKE_INSTALL_PREFIX}/
+      - ch.arknet.Turns/
       - build/
     expire_in: 24 hours
   parallel:
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9338cfa..cfba6a6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,12 +26,6 @@
 
     "cmake.configureOnOpen": true,
     "cmake.ctest.testExplorerIntegrationEnabled": false,
-    "cmake.configureArgs": [
-        "-DCMAKE_EXPORT_COMPILE_COMMANDS=YES",
-        "-DCMAKE_INSTALL_PREFIX=${env:HOME}/.local",
-        "-DTURNS_USE_INSTALLED_TRANSLATIONS=OFF",
-        "-DTURNS_USE_INSTALLED_SCHEMA_FILES=OFF"
-    ],
 
     "C_Cpp.autoAddFileAssociations": false,
     "C_Cpp.codeAnalysis.clangTidy.enabled": false,
diff --git a/CMakePresets.json b/CMakePresets.json
index a84435e..13bc7da 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -8,12 +8,37 @@
       "cacheVariables": {
         "CMAKE_CONFIGURATION_TYPES": "Debug;MinSizeRel"
       }
+    },
+    {
+      "inherits": "default",
+      "name": "develop",
+      "cacheVariables": {
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
+        "CMAKE_INSTALL_PREFIX": "${HOME}/.local",
+        "TURNS_USE_INSTALLED_SCHEMA_FILES": "NO",
+        "TURNS_USE_INSTALLED_TRANSLATIONS": "NO"
+      }
+    },
+    {
+      "inherits": "default",
+      "name": "ci",
+      "cacheVariables": {
+        "CMAKE_INSTALL_PREFIX": "ch.arknet.Turns"
+      }
     }
   ],
   "buildPresets": [
     {
       "name": "default",
       "configurePreset": "default"
+    },
+    {
+      "name": "develop",
+      "configurePreset": "develop"
+    },
+    {
+      "name": "ci",
+      "configurePreset": "ci"
     }
   ],
   "testPresets": [
@@ -23,6 +48,16 @@
       "output": {
         "outputOnFailure": true
       }
+    },
+    {
+      "inherits": "default",
+      "name": "develop",
+      "configurePreset": "develop"
+    },
+    {
+      "inherits": "develop",
+      "name": "ci",
+      "configurePreset": "ci"
     }
   ]
 }