Merge pull request #394 from kerautret/TravisFix

Fix travis (Thanks @phcerdan )
DGtal-team · Apr 6, 2021 · 33480a8 · 33480a8
2 parents 4718712 + 28a38a9
commit 33480a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,12 @@
 language: cpp
 dist: xenial
+osx_image: xcode12.2
 
 os:
 - linux
 - osx
+
+
 compiler:
 - gcc
 - clang

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,7 @@
 PROJECT(DGtalTools)
 
 cmake_minimum_required (VERSION 3.1)
+cmake_policy(SET CMP0057 NEW)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
@@ -66,24 +67,6 @@ SET(VERSION ${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools
 
 
 
- # -----------------------------------------------------------------------------
- # Looking for boost
- # -----------------------------------------------------------------------------
-
-set(Boost_USE_STATIC_LIBS   ON)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-set(Boost_FOUND FALSE)
-FIND_PACKAGE(Boost 1.50.0 REQUIRED)
-if ( Boost_FOUND )
-  ADD_DEFINITIONS(${BOOST_DEFINITIONS} -DBOOST_ALL_NO_LIB)
-  # SYSTEM to avoid warnings from boost.
-  include_directories(SYSTEM ${Boost_INCLUDE_DIRS} )
-  SET(DGtalToolsLibDependencies ${DGtalToolsLibDependencies}
-     ${Boost_LIBRAIRIES})
-   SET(DGtalLibInc ${Boost_INCLUDE_DIRS})
-endif( Boost_FOUND )
-
 
 
 

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,9 @@
 # DGtalTools 1.2
+- *global*
 
-
+  - Travis: Fix old default osx_image with xcode12.2 and remove non used boost
+    cmake references. (Bertrand Kerautret [#394](https://github.com/DGtal-team/DGtalTools/pull/394)) 
+
 
 # DGtalTools 1.1