Fixed windows and gcc on macOS

They take way too long to build though.

Author: Zialus

.travis.yml

@@ -25,6 +25,7 @@ env:
     # Boost
     - BOOST_VERSION=default
     # Misc
+    - GENERATOR="Unix Makefiles"
     - RUN_TESTS=true
     - COVERAGE=false
 
@@ -181,7 +182,7 @@ matrix:
            - clinfo
       env:
         - OPENCL_LIB=intel
-        - BOOST_VERSION="1_69_0" # Boost 1.69.0
+        - BOOST_VERSION="1_67_0" # Boost 1.67.0
         - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=201"
         - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include -DBOOST_COMPUTE_USE_CPP11=ON"
     # GCC
@@ -196,7 +197,7 @@ matrix:
           packages: *xenial_intel_latest_boost_packages
       env:
         - OPENCL_LIB=intel
-        - BOOST_VERSION="1_69_0" # Boost 1.69.0
+        - BOOST_VERSION="1_67_0" # Boost 1.67.0
         - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=201"
         - ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include -DBOOST_COMPUTE_ENABLE_COVERAGE=ON -DBOOST_COMPUTE_USE_CPP11=ON"
         - COVERAGE=true
@@ -211,7 +212,6 @@ matrix:
       osx_image: xcode10
       compiler: clang
       env:
-        - ENV_CXX_FLAGS="-Wno-c99-extensions"
         - MATRIX_EVAL="CC=clang && CXX=clang++ && export PATH=\"/usr/local/opt/llvm/bin:$PATH\" && export LDFLAGS=\"-L/usr/local/opt/llvm/lib\" && export CPPFLAGS=\"-I/usr/local/opt/llvm/include\""
       addons:
        homebrew:
@@ -227,25 +227,39 @@ matrix:
       osx_image: xcode10
       compiler: gcc
       env:
-        - ENV_CXX_FLAGS="-Wno-c99-extensions"
         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
       addons:
        homebrew:
          packages: *osx_packages
+      install:
+        - brew uninstall boost --ignore-dependencies
+        - travis_wait 50 brew install boost@1.57 --cc=gcc-5
+        - brew link boost@1.57 --force
 
     ############################################################################
     # Windows
     ############################################################################
     - os: windows
       env:
+        - GENERATOR="Visual Studio 15 2017 Win64"
+        - CXX_FLAGS="-DCI_BUILD"
         - ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=200"
         - NUGETDIR="C:/NUGET"
         - OCL_ROOT="$NUGETDIR/opencl-nug.0.777.77/build/native"
       install:
+        # Install OpenCV
+        - choco install opencv
+        - export OPENCV_DIR=C:/tools/opencv/build/x64/vc15/
+        # Install Boost
+        - wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.7z
+        - 7z x boost_1_67_0.7z -o/C/local
+        - pushd "/C/local/boost_1_67_0"
+        - ./bootstrap.bat
+        - ./b2.exe --with-libraries=program_options,filesystem,system,thread,test,timer,chrono
+        - popd
         # Install OpenCL headers and libraries
         - choco install nuget.commandline
         - nuget install opencl-nug -Version 0.777.77 -OutputDirectory $NUGETDIR
-        - ls -l $NUGETDIR/opencl-nug.0.777.77/build/native/
         # Install OpenCL Runtime
         - choco install opencl-intel-cpu-runtime
         # Check if it's working
@@ -367,8 +381,11 @@ script:
     - cd build
     - echo ${CMAKE_OPTIONS}
     - echo ${CXX_FLAGS}
-    - cmake ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ..
-    - cmake --build . --config Debug -j 4
+    - if [[ ${TRAVIS_OS_NAME} != "windows" ]]; then cmake -G"${GENERATOR}" ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" .. ; fi
+    - if [[ ${TRAVIS_OS_NAME} == "windows" ]]; then cmake -G"${GENERATOR} -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}".. ; fi
+    # https://stackoverflow.com/questions/39865367/warning-section-textcoal-nt-is-deprecate-since-updating-to-mac-osx-sierra
+    - if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then cmake --build . -j 4 --config Debug 2>&1 | grep -v -e '^/var/folders/*' -e '^[[:space:]]*\.section' -e '^[[:space:]]*\^[[:space:]]*~*' ; fi
+    - if [[ ${TRAVIS_OS_NAME} != "osx" ]]; then cmake --build . -j 4 --config Debug ; fi
     - |
       if [[ ${RUN_TESTS} == "true" ]]; then
         # print OpenCL devices