win fix

liblcf/Jenkinsfile

@@ -133,8 +133,7 @@ pipeline {
 						steps {
 							echo "Build for Windows ${BITS} bit - ${CONFIG}"
 							bat label: 'cmake', script: """
-								if ${BITS}==32 (SET arg=amd64_x86) else (SET arg=x64)
-								call %VCVARSALL2017% %arg%
+								if ${BITS}==32 (call %VCVARSALL2017% amd64_x86) else (call %VCVARSALL2017% x64)
 
 								if ${CONFIG}==debug (SET type=Debug) else (SET type=RelWithDebInfo)
 								if ${BITS}==32 (SET triplet=x86-windows-static) else (SET triplet=x64-windows-static)
@@ -143,19 +142,28 @@ pipeline {
 									-DCMAKE_TOOLCHAIN_FILE="%EASYDEV_VCPKG%\\scripts\\buildsystems\\vcpkg.cmake"^
 									-DBUILD_SHARED_LIBS=OFF^
 									-DCMAKE_INSTALL_PREFIX="%CD%\\build-${BITS}"
+								cmake --build ${CONFIG}
 							"""
 						}
 					}
 					stage('Test') {
 						steps {
 							echo "Test for Windows ${BITS} bit - ${CONFIG}"
-							bat "cmake --build ${CONFIG} --target check"
+							bat """
+								if ${BITS}==32 (call %VCVARSALL2017% amd64_x86) else (call %VCVARSALL2017% x64)
+
+								cmake --build ${CONFIG} --target check
+							"""
 						}
 					}
 					stage('Install') {
 						steps {
 							echo "Install for Windows ${BITS} bit - ${CONFIG}"
-							bat "cmake --build ${CONFIG} --target install"
+							bat """
+								if ${BITS}==32 (call %VCVARSALL2017% amd64_x86) else (call %VCVARSALL2017% x64)
+
+								cmake --build ${CONFIG} --target install
+							"""
 						}
 					}
 				}