Skip to content

Commit

Permalink
Merge pull request #444 from kerautret/Beta1.4
Browse files Browse the repository at this point in the history
beta 1.4
  • Loading branch information
dcoeurjo authored Dec 9, 2022
2 parents d61f2e5 + 4e0032c commit 5a01c53
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@

#David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
# -----------------------------------------------------------------------------
# Project definition
# -----------------------------------------------------------------------------
PROJECT(DGtalTools)

cmake_minimum_required (VERSION 3.1)
cmake_minimum_required (VERSION 3.11)
cmake_policy(SET CMP0057 NEW) # the new interpretation of IN_LIST is by default not set (at least until 3.21.1).

SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
Expand Down Expand Up @@ -60,8 +59,8 @@ include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
# -----------------------------------------------------------------------------
SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
SET(DGtalTools_VERSION_MAJOR 1)
SET(DGtalTools_VERSION_MINOR 3)
#SET(DGtalTools_VERSION_PATCH 0)
SET(DGtalTools_VERSION_MINOR 4)
#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.4 (beta)



# DGtalTools 1.3

- *build*
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,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.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)
* Release 1.0 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2704747.svg)](https://doi.org/10.5281/zenodo.2704747)
Expand Down

0 comments on commit 5a01c53

Please sign in to comment.