Skip to content
Snippets Groups Projects
Commit 6c343e86 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'dlib-gcc' into 'master'

compile dlib with our gcc

Closes #26

See merge request !71
parents b097e5f6 397d5678
Branches
Tags
1 merge request!71compile dlib with our gcc
Pipeline #
...@@ -15,28 +15,31 @@ source: ...@@ -15,28 +15,31 @@ source:
- add_global_cxx_release.patch - add_global_cxx_release.patch
build: build:
number: 0 number: 1
requirements: requirements:
build: build:
- python - python
- toolchain 2.3.2 - toolchain 2.3.2
- cmake - gcc 4.8.5 # [linux]
- mkl # [not win] - libgcc 4.8.5 # [linux]
- numpy x.x - cmake
- boost 1.61.* - mkl # [not win]
- jpeg 9b # [not win] - numpy x.x
- libpng 1.6.27 - boost 1.61.*
- sqlite 3.13.* # [not win] - jpeg 9b # [not win]
- libpng 1.6.27
- sqlite 3.13.* # [not win]
run: run:
- python - python
- mkl # [not win] - libgcc >=4.8.5 # [linux]
- numpy x.x - mkl # [not win]
- boost 1.61.* - numpy x.x
- jpeg 9b # [not win] - boost 1.61.*
- libpng >=1.6.27,<1.7 - jpeg 9b # [not win]
- sqlite 3.13.* # [not win] - libpng >=1.6.27,<1.7
- sqlite 3.13.* # [not win]
test: test:
files: files:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment