forked from github/server
MSVC builds go to a single output folder
Fix batch files to deal with new structure.
This commit is contained in:
parent
d8c0b57864
commit
6b5ddc57d9
|
@ -56,6 +56,7 @@ endif(TOLUA_FOUND)
|
||||||
|
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
|
||||||
add_subdirectory (tolua)
|
add_subdirectory (tolua)
|
||||||
add_subdirectory (tools)
|
add_subdirectory (tools)
|
||||||
add_subdirectory (storage)
|
add_subdirectory (storage)
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
@ECHO OFF
|
@ECHO OFF
|
||||||
IF EXIST ..\build-vs10 SET BUILD=..\build-vs10\eressea\Debug
|
IF EXIST ..\build-vs10 SET BUILD=..\build-vs10\Debug
|
||||||
IF EXIST ..\build-vs11 SET BUILD=..\build-vs11\eressea\Debug
|
IF EXIST ..\build-vs11 SET BUILD=..\build-vs11\\Debug
|
||||||
IF EXIST ..\build-vs12 SET BUILD=..\build-vs12\eressea\Debug
|
IF EXIST ..\build-vs12 SET BUILD=..\build-vs12\Debug
|
||||||
IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\eressea\Debug
|
IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\Debug
|
||||||
IF EXIST ..\build-vs15 SET BUILD=..\build-vs15\eressea\Debug
|
IF EXIST ..\build-vs15 SET BUILD=..\build-vs15\Debug
|
||||||
IF EXIST ..\build-vs16 SET BUILD=..\build-vs16\eressea\Debug
|
IF EXIST ..\build-vs16 SET BUILD=..\build-vs16\Debug
|
||||||
|
|
||||||
SET SERVER=%BUILD%\eressea.exe
|
SET SERVER=%BUILD%\eressea.exe
|
||||||
%BUILD%\test_eressea.exe
|
%BUILD%\test_eressea.exe
|
||||||
SET LUA_PATH=..\share\lua\5.4\?.lua;;
|
REM SET LUA_PATH=..\share\lua\5.4\?.lua;;
|
||||||
|
|
||||||
%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
|
||||||
|
|
Loading…
Reference in New Issue