Skip to content

Commit

Permalink
Merge pull request #50 from kerautret/Release1.1
Browse files Browse the repository at this point in the history
Release 1.1
  • Loading branch information
dcoeurjo authored Oct 9, 2020
2 parents 66f007b + 2957c07 commit e6413e2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: cpp
dist: trusty
sudo: false
dist: xenial



compiler:
Expand Down
6 changes: 4 additions & 2 deletions .travis/install_deps_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
#
# Note: gmp and boost already installed
#
brew update
brew update > brew.log
#brew install qt5 doxygen homebrew/science/hdf5 graphviz graphicsmagick fftw eigen
brew install qt5 graphicsmagick fftw eigen
# Explicit install of libqglviewer
brew install http://liris.cnrs.fr/david.coeurjolly/misc/libqglviewer.rb
brew tap DGtal-team/homebrew-dgtal
brew install libqglviewer


6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)


# -----------------------------------------------------------------------------
# CPP11
# -----------------------------------------------------------------------------
# CPP11
# -----------------------------------------------------------------------------
set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_STANDARD_REQUIRED TRUE)

Expand Down Expand Up @@ -52,7 +52,7 @@ include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
# -----------------------------------------------------------------------------
# SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
SET(DGtalToolsContrib_VERSION_MAJOR 1)
SET(DGtalToolsContrib_VERSION_MINOR 0)
SET(DGtalToolsContrib_VERSION_MINOR 1)
SET(DGtalToolsContrib_VERSION_PATCH 0)
SET(DGTALTOOLSContrib_VERSION "${DGtalToolsContrib_VERSION_MAJOR}.${DGtalToolsContrib_VERSION_MINOR}.${DGtalToolsContrib_VERSION_PATCH}")
SET(PROJECT_VERSION "${DGtalToolsContrib_VERSION_MAJOR}.${DGtalToolsContrib_VERSION_MINOR}.${DGtalToolsContrib_VERSION_PATCH}")
Expand Down

0 comments on commit e6413e2

Please sign in to comment.