summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt6
-rw-r--r--ChangeLog12
2 files changed, 15 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 478929d..7f7dac4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 2.6.0)
set(APPLICATION_NAME ${PROJECT_NAME})
set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "0")
-set(APPLICATION_VERSION_PATCH "1")
+set(APPLICATION_VERSION_MINOR "1")
+set(APPLICATION_VERSION_PATCH "0")
set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
@@ -19,7 +19,7 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO
# Increment AGE. Set REVISION to 0
# If the source code was changed, but there were no interface changes:
# Increment REVISION.
-set(LIBRARY_VERSION "0.3.1")
+set(LIBRARY_VERSION "0.4.0")
set(LIBRARY_SOVERSION "0")
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
diff --git a/ChangeLog b/ChangeLog
index 819d10f..0319c15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Sep 21 2016 Andreas Schneider <asn@cryptomilk.org>
+ * cmocka: version 1.1.0
+ * Added support to catch multiple exceptions
+ * Added support to verify call ordering
+ * Added support to pass initial data to test cases
+ * Added will_return_maybe() for ignoring mock returns
+ * Added subtests for groups using TAP output
+ * Added support to write multiple XML files for groups
+ * Improved documentation
+ * Fixed XML output generataion
+ * Fixed Windows builds with VS2015
+
Thu Mar 12 2015 Andreas Schneider <asn@cryptomilk.org>
* cmocka: version 1.0.1
* Added a macro for assert_ptr_equal().