Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit c7a04c2

Browse files
authored
Merge pull request #412 from igchor/stable_1.5_appveyor_update
Backport appveyor update to stable-1.5
2 parents 7163200 + 929eb94 commit c7a04c2

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

appveyor.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: 1.4.{build}
2-
os: Visual Studio 2015
2+
os: Visual Studio 2017
33
platform: x64
44

55
environment:
@@ -24,18 +24,21 @@ before_build:
2424
- cmake . -Bbuild -G "%GENERATOR%"
2525
-DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
2626
-DCMAKE_INSTALL_PREFIX=c:/install/libpmemobj-cpp
27+
-DTESTS_USE_FORCED_PMEM=ON
2728

2829
build_script:
2930
- msbuild build/ALL_BUILD.vcxproj /property:Configuration=%CONFIGURATION%
31+
/verbosity:minimal
3032

3133
test_script:
3234
- cd build
3335
- ctest -C %CONFIGURATION% --output-on-failure
34-
- msbuild INSTALL.vcxproj
36+
- msbuild INSTALL.vcxproj /verbosity:minimal
3537
- cd ..
3638
# build standalone example
3739
- cd examples/map_cli
3840
- cmake . -G "%GENERATOR%"
3941
-DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
4042
-DCMAKE_PREFIX_PATH=c:/install/libpmemobj-cpp
41-
- msbuild ALL_BUILD.vcxproj
43+
-DTESTS_USE_FORCED_PMEM=ON
44+
- msbuild ALL_BUILD.vcxproj /verbosity:minimal

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ add_check_whitespace(tests-common ${CMAKE_CURRENT_SOURCE_DIR}/common/*.*pp)
3636
add_check_whitespace(tests-cmake ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
3737

3838
if(MSVC_VERSION)
39-
add_flag(-W4)
39+
add_flag(-W3)
4040
else()
4141
add_flag(-Wall)
4242
endif()

0 commit comments

Comments
 (0)