Skip to content

Commit 6e7e433

Browse files
compilation error on windows.
1 parent 9650c4d commit 6e7e433

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

configure.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ del /f /q glog >nul 2>&1
215215
mklink /j glog glog-%GLOG_VERSION% >nul 2>&1
216216
cd %BASEDIR%3rdparty\glog
217217
rmdir /s /q build >nul 2>&1
218-
set CMAKECMD=cmake -S . -B build %CMAKEOPT%
218+
set CMAKECMD=cmake -S . -B build %CMAKEOPT% -DBUILD_SHARED_LIBS=OFF
219219
echo %CMAKECMD%
220220
%CMAKECMD%
221221
set CMAKECMD=cmake --build build -j

tools/test/releasetest/releasetest.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ cd %APPDIR%
6262
echo n | tspawn s blog
6363
tspawn w foo
6464

65+
:: Set ExecutionPolicy
66+
powershell -Command "Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope CurrentUser -Force"
67+
6568
:: Test in debug mode
6669
if not "%CMAKE%" == "" (
6770
call :CMakeBuild Debug

tools/tfserver/tfserver.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ windows {
3131
# for windows
3232
CONFIG(debug, debug|release) {
3333
TARGET = $$join(TARGET,,,d)
34-
LIBS += -ltreefrogd$${TF_VER_MAJ} ../../3rdparty/glog/build/Debug/glogd.lib
34+
LIBS += -ltreefrogd$${TF_VER_MAJ} ../../3rdparty/glog/build/Debug/glogd.lib dbghelp.lib
3535
} else {
3636
LIBS += -ltreefrog$${TF_VER_MAJ}
3737
}

0 commit comments

Comments
 (0)