Skip to content

Commit

Permalink
Merge pull request #85 from kerautret/1_4
Browse files Browse the repository at this point in the history
release 1.4
  • Loading branch information
kerautret authored Jun 11, 2024
2 parents 58058c7 + 9787631 commit 553b78c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include(polyscope)
set (CMAKE_CXX_STANDARD_REQUIRED TRUE)


FIND_PACKAGE(DGtal 1.3 REQUIRED)
FIND_PACKAGE(DGtal 1.4 REQUIRED)
INCLUDE_DIRECTORIES(${DGTAL_INCLUDE_DIRS})
LINK_DIRECTORIES(${DGTAL_LIBRARY_DIRS})

Expand Down Expand Up @@ -59,7 +59,7 @@ include_directories(${PROJECT_SOURCE_DIR})
# SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
SET(DGtalToolsContrib_VERSION_MAJOR 1)
SET(DGtalToolsContrib_VERSION_MINOR 4)
SET(DGtalToolsContrib_VERSION_PATCH beta)
#SET(DGtalToolsContrib_VERSION_PATCH beta)
SET(DGTALTOOLSContrib_VERSION "${DGtalToolsContrib_VERSION_MAJOR}.${DGtalToolsContrib_VERSION_MINOR}.${DGtalToolsContrib_VERSION_PATCH}")
SET(PROJECT_VERSION "${DGtalToolsContrib_VERSION_MAJOR}.${DGtalToolsContrib_VERSION_MINOR}.${DGtalToolsContrib_VERSION_PATCH}")
SET(VERSION ${DGtalToolsContrib_VERSION_MAJOR}.${DGtalToolsContrib_VERSION_MINOR}.${DGtalToolsContrib_VERSION_PATCH})
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DGtalTools-contrib 1.4 (beta)
# DGtalTools-contrib 1.4
- *build*
- Remove STBimage preprocessor instruction used to fix MVSC that is
no more usefull since DGtal PR [175](https://github.com/DGtal-team/DGtal/pull/1715)
Expand Down

0 comments on commit 553b78c

Please sign in to comment.