Skip to content

Commit da1cd24

Browse files
committed
Update for v34
1 parent 0ec06b2 commit da1cd24

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 33
11+
VERSION 34
1212
COMPATIBILITY AnyNewerVersion)
1313

1414
if (CXX_STANDARD MATCHES "11")

ChangeLog

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
v34 2019-04-01
2+
13
* Rearranged include directory structure to make it easier to use, and
24
to write, adapters for unit test frame works. Now, if you want to
35
use Trompeloeil with, for example, the 'doctest' unit testing frame
@@ -6,7 +8,7 @@
68
#include <doctest.h>
79
#include <doctest/trompeloeil.hpp>
810

9-
The old adaptation mechanisms still work.
11+
The old adaptation mechanisms still work. See issue #118
1012

1113
* Support compilation without RTTI support. This makes error reporting
1214
from deathwatched<> violations less informative (it cannot mention

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