Skip to content

Commit 08cba57

Browse files
committed
Prepared for v38
1 parent 6610966 commit 08cba57

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

CMakeLists.txt

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

1111
write_basic_package_version_file(
1212
"${CMAKE_CURRENT_BINARY_DIR}/trompeloeil/trompeloeil-config-version.cmake"
13-
VERSION 37
13+
VERSION 38
1414
COMPATIBILITY AnyNewerVersion)
1515

1616
add_library(trompeloeil INTERFACE)

ChangeLog

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
v38 2020-06-08
2+
3+
* Fixed bug where ALLOW_CALL only worked with sequences
4+
if called at least once
5+
6+
* Fixed bug to support IMPLEMENT_MOCKx and IMPLEMENT_CONST_MOCKx
7+
constexpr
8+
9+
* More fixes to Conan packaging. Thank you Kai Bernhard.
10+
11+
* Support OK-reporters from the runtime reporter registration
12+
API. Thank you Moritz Haase.
13+
14+
* Rewrites to not trigger deprecation warnings in C++17 builds.
15+
Thank you Kasper Laudrup.
16+
117
v37 2020-02-09
218

319
* Added adapter for the Criterion unit testing framework. Thanks you

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=v37%3Astable) ](https://bintray.com/trompeloeil/trompeloeil/trompeloeil%3Arollbear/v37%3Astable/link)
11+
[conan.io](https://conan.io) [ ![Download](https://api.bintray.com/packages/trompeloeil/trompeloeil/trompeloeil%3Arollbear/images/download.svg?version=v38%3Astable) ](https://bintray.com/trompeloeil/trompeloeil/trompeloeil%3Arollbear/v38%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 = "v37"
19+
version = "v38"
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)