mirror of https://github.com/EspoTek/Labrador.git
Replace -lomp with -fopenmp (#187)
* Replace -lomp with -fopenmp * Restore -lomp for OSX Travis build indicates it does not recognize -fopenmp.
This commit is contained in:
parent
682d49dc13
commit
556edb3245
|
@ -18,7 +18,6 @@ matrix:
|
||||||
- g++-7
|
- g++-7
|
||||||
- gcc-7
|
- gcc-7
|
||||||
- libfftw3-dev
|
- libfftw3-dev
|
||||||
- libomp-dev
|
|
||||||
- qt5-default
|
- qt5-default
|
||||||
- libusb-1.0-0-dev
|
- libusb-1.0-0-dev
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -360,7 +360,8 @@ DISTFILES += \
|
||||||
build_android/package_source/res/xml/device_filter.xml
|
build_android/package_source/res/xml/device_filter.xml
|
||||||
|
|
||||||
# Vincenzo added these to get multithreading on Unix fftw
|
# Vincenzo added these to get multithreading on Unix fftw
|
||||||
unix: LIBS += -lomp
|
unix:!macx: LIBS += -fopenmp
|
||||||
|
macx: LIBS += -lomp
|
||||||
unix: LIBS += -lfftw3f_omp
|
unix: LIBS += -lfftw3f_omp
|
||||||
unix: LIBS += -lfftw3_threads
|
unix: LIBS += -lfftw3_threads
|
||||||
macx: INCLUDEPATH += /usr/local/include
|
macx: INCLUDEPATH += /usr/local/include
|
||||||
|
|
Loading…
Reference in New Issue