diff --git a/CMakeLists.txt b/CMakeLists.txt index b64826e0..68932256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ include(CMakePackageConfigHelpers) write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/trompeloeil/trompeloeil-config-version.cmake" - VERSION 27 + VERSION 28 COMPATIBILITY AnyNewerVersion) set(CMAKE_CXX_STANDARD 14) diff --git a/ChangeLog b/ChangeLog index 83428c3f..b112cea5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +v28 2017-07-24 + + * You can place expectations on types multiply inheriting several + mock types. + * Changed directory structure. "trompeloeil.hpp" now resides in directory "include". Self test programs "compiling_tests.cpp" and "thread_terror.cpp" resides in directory "test". @@ -5,7 +10,7 @@ * Major work on CMake support - "make install" - works as before and also includes a package - For CMake based project you can use - . "find_package(trompeloeil 27 REQUIRED)" and add + . "find_package(trompeloeil 28 REQUIRED)" and add "target_link_libraries( trompeloeil)" for your test target . use "add_subdirectory(trompeloeil)" if you prefer to track