From 3508fceddc4de3d43c552aba0a976a8ff5eb9143 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 22 Feb 2021 19:32:08 +0100
Subject: [PATCH] Add CMakeSettings.json to git Expect the system LUA_PATH to
 point to luarocks

---
 .gitignore         |  1 -
 CMakeSettings.json | 39 +++++++++++++++++++++++++++++++++++++++
 tests/runtests.bat |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 CMakeSettings.json

diff --git a/.gitignore b/.gitignore
index 5b1e405be..130d69cd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,3 @@ tests/data/185.dat
 /critbit/
 *.mo
 /.vs
-/CMakeSettings.json
diff --git a/CMakeSettings.json b/CMakeSettings.json
new file mode 100644
index 000000000..934963e60
--- /dev/null
+++ b/CMakeSettings.json
@@ -0,0 +1,39 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CMAKE_TOOLCHAIN_FILE",
+          "value": "${env.VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MODULE_PATH",
+          "value": "${workspaceRoot}/cmake/Modules",
+          "type": "STRING"
+        }
+      ]
+    },
+    {
+      "name": "x86-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "variables": []
+    }
+  ]
+}
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 80eefc9be..5925f07e3 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -10,7 +10,7 @@ IF EXIST ..\out\build\x64-Debug\eressea.exe SET BUILD=..\out\build\x64-Debug
 
 SET SERVER=%BUILD%\eressea.exe
 %BUILD%\test_eressea.exe
-SET LUA_PATH=..\scripts\?.lua;..\share\lua\5.4\?.lua;;
+SET LUA_PATH=..\scripts\?.lua;%LUA_PATH%
 
 %SERVER% -v1 ..\scripts\run-tests.lua
 %SERVER% -v1 -re2 ..\scripts\run-tests-e2.lua