Skip to content

Commit

Permalink
Update for v33
Browse files Browse the repository at this point in the history
  • Loading branch information
rollbear committed Jan 21, 2019
1 parent 17edd13 commit 31faa9a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include(CheckCXXCompilerFlag)

write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/trompeloeil/trompeloeil-config-version.cmake"
VERSION 32
VERSION 33
COMPATIBILITY AnyNewerVersion)

if (CXX_STANDARD MATCHES "11")
Expand Down
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
v33 2019-01-21

* Silenced noisy g++-7 -Wuseless-cast warning

* Fixed a bug where a mocked function would not compile if a parameter
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CI: [ ![Build Status](https://travis-ci.org/rollbear/trompeloeil.svg?branch=mast
https://ci.appveyor.com/project/rollbear/trompeloeil)
[![Coverage Status](https://coveralls.io/repos/rollbear/trompeloeil/badge.svg?branch=master&service=github)](https://coveralls.io/github/rollbear/trompeloeil?branch=master)

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

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

Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Trompeloeil C++ mocking framework
#
# Copyright Bjorn Fahller 2017
# Copyright Bjorn Fahller 2017-2019
#
# Use, modification and distribution is subject to the
# Boost Software License, Version 1.0. (See accompanying
Expand All @@ -16,7 +16,7 @@

class TrompeloelConan(ConanFile):
name = "trompeloeil"
version = "v32"
version = "v33"
license = "Boost Software License - Version 1.0 - August 17th, 2003"
url = "https://github.com/rollbear/trompeloeil.git"
description = "Header only C++14 mocking framework"
Expand Down

0 comments on commit 31faa9a

Please sign in to comment.