Skip to content

Commit 297cd66

Browse files
Merge pull request #39 from tusharpm/appveyor_fix
Fix AppVeyor build
2 parents 9e5162c + 6f8258b commit 297cd66

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

appveyor.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,20 @@ version: '{build}'
33
environment:
44
matrix:
55
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
6-
platform: x86
7-
FLAGS: ""
8-
GENERATOR: Visual Studio 15 2017
6+
CMAKE_GENERATOR: Visual Studio 15 2017
7+
CMAKE_GENERATOR_PLATFORM: Win32
98

109
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
11-
platform: x64
12-
FLAGS: ""
13-
GENERATOR: Visual Studio 15 2017
10+
CMAKE_GENERATOR: Visual Studio 15 2017
11+
CMAKE_GENERATOR_PLATFORM: x64
1412

1513
init:
1614
- cmake --version
1715
- msbuild /version
1816

1917
before_build:
20-
- mkdir build
18+
- cmake -S . -B build
2119
- cd build
22-
- cmake .. -G "%GENERATOR%" -DBUILD_TESTS=ON -DCMAKE_CXX_FLAGS="%FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"
2320

2421
build_script:
2522
- cmake --build . --config Release

test/test_generators.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ TEST_CASE("Test name generator equality (char const*, std::string, std::string_v
297297
REQUIRE(id2 == id3);
298298
}
299299

300-
#ifdef _WIN32
300+
#ifdef UUID_TIME_GENERATOR
301301
TEST_CASE("Test time generator", "[gen][time]")
302302
{
303303
uuid_time_generator gen;

0 commit comments

Comments
 (0)