Merge pull request #39 from tusharpm/appveyor_fix

Fix AppVeyor build
This commit is contained in:
Marius Bancila 2021-06-15 09:55:39 +03:00 committed by GitHub
commit 297cd66004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions

View File

@ -3,23 +3,20 @@ version: '{build}'
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
platform: x86
FLAGS: ""
GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR_PLATFORM: Win32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
platform: x64
FLAGS: ""
GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR_PLATFORM: x64
init:
- cmake --version
- msbuild /version
before_build:
- mkdir build
- cmake -S . -B build
- cd build
- cmake .. -G "%GENERATOR%" -DBUILD_TESTS=ON -DCMAKE_CXX_FLAGS="%FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"
build_script:
- cmake --build . --config Release

View File

@ -297,7 +297,7 @@ TEST_CASE("Test name generator equality (char const*, std::string, std::string_v
REQUIRE(id2 == id3);
}
#ifdef _WIN32
#ifdef UUID_TIME_GENERATOR
TEST_CASE("Test time generator", "[gen][time]")
{
uuid_time_generator gen;