Merge pull request #679 from tpaviot/review/fix-travis

Review/fix travis

Author: tpaviot

.travis.yml

@@ -31,49 +31,41 @@ env:
 
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
-      - gcc-multilib
-      - g++-multilib
-      - lib32z1+
-      - lsb-core
-      - g++-7
+      - mesa-common-dev
+      - libgl1-mesa-dev
+      - libglu1-mesa-dev
 
 matrix:
   include:
     - env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64"
       os: linux
-      dist: trusty
+      dist: bionic
     - env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64"
       os: osx
       osx_image: xcode9.4
     - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
       os: linux
-      dist: trusty
+      dist: bionic
     - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
       os: osx
       osx_image: xcode9.4
     - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
       os: linux
-      dist: trusty
+      dist: bionic
     - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
       os: osx
       osx_image: xcode9.4
     - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
       os: linux
-      dist: trusty
+      dist: bionic
     - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
       os: osx
       osx_image: xcode9.4
 # Use miniconda to install binary versions of numpy etc. from continuum
 # analytic's repository. Follows an approach described by Dan Blanchard:
 # https://gist.github.com/dan-blanchard/7045057
 before_install:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      export CXX=g++-7;
-      export CC=gcc-7;
-    fi;
   - if [ ${PYTHON:0:1} == "2" ]; then
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -99,8 +91,8 @@ before_install:
   # install everything required to build the receipe
   # conda-build 3.2.0 on osx to prevent using check_overlinking
   # method which is quite loooong to process
-  - conda install conda-build==3.2.0
-  - conda install anaconda-client
+  #- conda install conda-build==3.2.0
+  - conda install conda-build anaconda-client
   # Useful for debugging any issues with conda
   - conda info -a
   # download/install OCE from DLR-SC channel

CMakeLists.txt

@@ -26,6 +26,19 @@ set(PYTHONOCC_VERSION_DEVEL -dev)
 
 cmake_minimum_required(VERSION 2.6)
 
+## cmake policies
+if (NOT CMAKE_VERSION VERSION_LESS "3.13")
+    # CMP0077: option() honors normal variables
+    # https://cmake.org/cmake/help/latest/policy/CMP0077.html
+    cmake_policy(SET CMP0077 NEW)
+    # CMP0078: UseSWIG generates standard target names.
+    # https://cmake.org/cmake/help/latest/policy/CMP0078.html
+    cmake_policy(SET CMP0078 OLD)
+    # CMP0086: UseSWIG honors SWIG_MODULE_NAME via -module
+    cmake_policy(SET CMP0086 OLD)
+endif()
+
+
 if( NOT DEFINED PYTHONOCC_BUILD_TYPE )
   set( PYTHONOCC_BUILD_TYPE "Release" CACHE STRING "Build type" ) # By default set release build
 endif( NOT DEFINED PYTHONOCC_BUILD_TYPE )

ci/conda/meta.yaml

@@ -27,7 +27,7 @@ requirements:
     - cmake
     - ninja ==1.8.2
     - swig ==3.0.12
-    - freetype ==2.9.1
+    - freetype >=2.9
     - smesh ==6.7.6
 
   run: