Add CMakeSettings.json to git

Expect the system LUA_PATH to point to luarocks
This commit is contained in:
Enno Rehling 2021-02-22 19:32:08 +01:00
parent 56896361fb
commit 3508fceddc
3 changed files with 40 additions and 2 deletions

1
.gitignore vendored
View File

@ -46,4 +46,3 @@ tests/data/185.dat
/critbit/ /critbit/
*.mo *.mo
/.vs /.vs
/CMakeSettings.json

39
CMakeSettings.json Normal file
View File

@ -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": []
}
]
}

View File

@ -10,7 +10,7 @@ IF EXIST ..\out\build\x64-Debug\eressea.exe SET BUILD=..\out\build\x64-Debug
SET SERVER=%BUILD%\eressea.exe SET SERVER=%BUILD%\eressea.exe
%BUILD%\test_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 ..\scripts\run-tests.lua
%SERVER% -v1 -re2 ..\scripts\run-tests-e2.lua %SERVER% -v1 -re2 ..\scripts\run-tests-e2.lua