From 556edb324503f0d558283258d1cfcb74a84d3174 Mon Sep 17 00:00:00 2001 From: turboencabulator Date: Wed, 3 Nov 2021 20:47:18 -0500 Subject: [PATCH] Replace -lomp with -fopenmp (#187) * Replace -lomp with -fopenmp * Restore -lomp for OSX Travis build indicates it does not recognize -fopenmp. --- .travis.yml | 1 - Desktop_Interface/Labrador.pro | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7727bb89..bc2f2e3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ matrix: - g++-7 - gcc-7 - libfftw3-dev - - libomp-dev - qt5-default - libusb-1.0-0-dev env: diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro index 7d754d6b..f1195d39 100644 --- a/Desktop_Interface/Labrador.pro +++ b/Desktop_Interface/Labrador.pro @@ -360,7 +360,8 @@ DISTFILES += \ build_android/package_source/res/xml/device_filter.xml # 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 += -lfftw3_threads macx: INCLUDEPATH += /usr/local/include