Merge branch 'hotfix/2.5.1'

richoux · Jul 11, 2022 · 918278d · 918278d
2 parents 51e4cf1 + 6be854d
commit 918278d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -185,7 +185,7 @@ set (CPACK_PACKAGE_NAME "GHOST")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set (CPACK_PACKAGE_VERSION_MAJOR "2")
 set (CPACK_PACKAGE_VERSION_MINOR "5")
-set (CPACK_PACKAGE_VERSION_PATCH "0")
+set (CPACK_PACKAGE_VERSION_PATCH "1")
 set (CPACK_PACKAGE_CONTACT "florian.richoux@polytechnique.edu")
 set (CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
 include (CPack)
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file, since GHOST 2.0.0.
 
+## [2.5.1] - 2022-07-11
+- Fix minor forgettings (Doxygen file, README, ...).
+
 ## [2.5.0] - 2022-07-11
 - Add all possible linear equation global constraints.
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![](https://github.com/richoux/GHOST/wiki/images/GHOST_banner.png)
 
-[![2.4.0](https://img.shields.io/badge/stable-2.4.0-brightgreen.svg)](https://github.com/richoux/GHOST/releases/tag/2.4.0)
-[![2.4.x](https://img.shields.io/badge/latest-2.4.x-f57f17.svg)](https://github.com/richoux/GHOST/tree/develop)
+[![2.5.1](https://img.shields.io/badge/stable-2.5.1-brightgreen.svg)](https://github.com/richoux/GHOST/releases/tag/2.5.1)
+[![2.5.x](https://img.shields.io/badge/latest-2.5.x-f57f17.svg)](https://github.com/richoux/GHOST/tree/develop)
 [![Actions Status](https://github.com/richoux/GHOST/workflows/Linux/badge.svg)](https://github.com/richoux/GHOST/actions)
 [![Actions Status](https://github.com/richoux/GHOST/workflows/MacOS/badge.svg)](https://github.com/richoux/GHOST/actions)
 [![Actions Status](https://github.com/richoux/GHOST/workflows/Windows/badge.svg)](https://github.com/richoux/GHOST/actions)

diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -782,7 +782,12 @@ INPUT                  = doc/mainpage.md \
                          include/variable.hpp \
                          include/global_constraints/all_different.hpp \
                          include/global_constraints/fix_value.hpp \
-                         include/global_constraints/linear_equation.hpp 
+                         include/global_constraints/linear_equation_eq.hpp \
+                         include/global_constraints/linear_equation_neq.hpp \
+                         include/global_constraints/linear_equation_leq.hpp \
+                         include/global_constraints/linear_equation_geq.hpp \
+                         include/global_constraints/linear_equation_l.hpp \
+                         include/global_constraints/linear_equation_g.hpp 
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses