Merge branch 'master' into FixDocDeploy

DGtal-team · Jun 12, 2024 · 5b82acf · 5b82acf
2 parents 1563e11 + abb50c0
commit 5b82acf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ option(DISABLE_POLYSCOPE "Disable polyscope based tools" OFF)
 # -----------------------------------------------------------------------------
 message(STATUS "-------------------------------------------------------------------------------")
 message(STATUS "Checking if DGtal is installed:")
-FIND_PACKAGE(DGtal 1.4 REQUIRED)
+FIND_PACKAGE(DGtal 1.5 REQUIRED)
 INCLUDE_DIRECTORIES(${DGTAL_INCLUDE_DIRS})
 LINK_DIRECTORIES(${DGTAL_LIBRARY_DIRS})
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -73,8 +73,8 @@ include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
 # -----------------------------------------------------------------------------
 SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 SET(DGtalTools_VERSION_MAJOR 1)
-SET(DGtalTools_VERSION_MINOR 4)
-#SET(DGtalTools_VERSION_PATCH beta)
+SET(DGtalTools_VERSION_MINOR 5)
+SET(DGtalTools_VERSION_PATCH beta)
 SET(DGTALTOOLS_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
 SET(PROJECT_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
 SET(VERSION ${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH})

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# DGtalTools 1.5 (beta)
+
+
+
 # DGtalTools 1.4 
 
 - *build*

diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ own source code (in complement of DGtal tutorial https://dgtal-team.github.io/do
 More Information
 ----------------
 * Related DGtalTools-contrib: https://github.com/DGtal-team/DGtalTools-contrib
+* Release 1.4 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11577409.svg)](https://doi.org/10.5281/zenodo.11577409)
 * Release 1.3 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7395984.svg)](https://doi.org/10.5281/zenodo.7395984)
 * Release 1.2 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4893597.svg)](https://doi.org/10.5281/zenodo.4893597)
 * Release 1.1 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4079375.svg)](https://doi.org/10.5281/zenodo.4079375)