Skip to content

Commit 9c783cd

Browse files
committed
Updates for v37
1 parent 93869d8 commit 9c783cd

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include(CheckCXXCompilerFlag)
88

99
write_basic_package_version_file(
1010
"${CMAKE_CURRENT_BINARY_DIR}/trompeloeil/trompeloeil-config-version.cmake"
11-
VERSION 36
11+
VERSION 37
1212
COMPATIBILITY AnyNewerVersion)
1313

1414
add_library(trompeloeil INTERFACE)

ChangeLog

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
v37 2020-02-09
2+
13
* Added adapter for the Criterion unit testing framework. Thanks you
24

35
Etienne Barbier <[email protected]>
@@ -13,7 +15,7 @@
1315
* Fix issue 173 for GCC 4.x by performing testing to confirm
1416
correctness of existing code.
1517

16-
v36 2019-04-01
18+
v36 2019-12-29
1719

1820
* Status reporting of passed expectation calls as sucessful assertions in
1921
DOCTEST and Catch2. Thanks to:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CI: [ ![Build Status](https://travis-ci.org/rollbear/trompeloeil.svg?branch=mast
88
https://ci.appveyor.com/project/rollbear/trompeloeil)
99
[![Coverage Status](https://coveralls.io/repos/rollbear/trompeloeil/badge.svg?branch=master&service=github)](https://coveralls.io/github/rollbear/trompeloeil?branch=master)
1010

11-
[conan.io](https://conan.io) [ ![Download](https://api.bintray.com/packages/trompeloeil/trompeloeil/trompeloeil%3Arollbear/images/download.svg?version=v36%3Astable) ](https://bintray.com/trompeloeil/trompeloeil/trompeloeil%3Arollbear/v36%3Astable/link)
11+
[conan.io](https://conan.io) [ ![Download](https://api.bintray.com/packages/trompeloeil/trompeloeil/trompeloeil%3Arollbear/images/download.svg?version=v37%3Astable) ](https://bintray.com/trompeloeil/trompeloeil/trompeloeil%3Arollbear/v37%3Astable/link)
1212

1313
[![HitCount](http://hits.dwyl.io/rollbear/trompeloeil.svg)](http://hits.dwyl.io/rollbear/trompeloeil)
1414

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class TrompeloelConan(ConanFile):
1818
name = "trompeloeil"
19-
version = "v36"
19+
version = "v37"
2020
license = "Boost Software License - Version 1.0 - August 17th, 2003"
2121
url = "https://github.com/rollbear/trompeloeil.git"
2222
description = "Header only C++14 mocking framework"

0 commit comments

Comments
 (0)