commit 72f383f5f4ce1a6d9dfc931f7a105a1f066abedf
parent 8c93d0cfaa7c5ff71d2e0570b0430c46dce7feb9
Author: vaplv <vaplv@free.fr>
Date: Tue, 12 Dec 2017 15:11:55 +0100
Merge branch 'release_1.3.1' into develop
Diffstat:
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -28,11 +28,16 @@ can be edited, built, tested and installed as any CMake project.
## Release notes
+### Version 1.3.1
+
+- Update the version of the RSys dependency to 0.6: replace the deprecated
+ `[N]CHECK` macros by the new macro `CHK`.
+
### Version 1.3
- Add the `aw_obj_purge` and `aw_mtl_purge` functions that not only reset the
-state of the loaders, as the `aw_obj_clear` and `aw_mtl_clear` functions, but
-also free their internal memory.
+ state of the loaders, as the `aw_obj_clear` and `aw_mtl_clear` functions, but
+ also free their internal memory.
## License
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -25,7 +25,7 @@ set(AW_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
################################################################################
# Dependencies
################################################################################
-find_package(RCMake REQUIRED)
+find_package(RCMake 0.4 REQUIRED)
find_package(RSys 0.6 REQUIRED)
set(CMAKE_MODULE_PATH ${RCMAKE_SOURCE_DIR})
@@ -38,7 +38,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys)
################################################################################
set(VERSION_MAJOR 1)
set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(AW_FILES_SRC aw_c.h aw.c aw_obj.c aw_mtl.c)