Skip to content

Commit

Permalink
Merge pull request #462 from kerautret/1.5beta
Browse files Browse the repository at this point in the history
base 1.5 beta
  • Loading branch information
kerautret committed Jun 12, 2024
2 parents f933e3c + 908dc8d commit abb50c0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# DGtalTools 1.5 (beta)



# DGtalTools 1.4

- *build*
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit abb50c0

Please sign in to comment.