diff --git a/.travis.yml b/.travis.yml index f6464b9d..57a944e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,9 @@ install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install qt59base qt59tools --force-yes; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt59/bin/qt59-env.sh; fi + # (Mac) Install OpenMP + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_VERBOSE_USING_DOTS=1 brew reinstall --verbose libomp; fi + script: # Build Dust3D diff --git a/dust3d.pro b/dust3d.pro index 9e1cc53e..0c4c1d50 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -502,6 +502,16 @@ INCLUDEPATH += thirdparty/QuadriFlow/3rd/pcg32 INCLUDEPATH += thirdparty/QuadriFlow/3rd/pss INCLUDEPATH += thirdparty/QuadriFlow/3rd/lemon-1.3.1 +macx: { + exists(/usr/local/opt/libomp) { +# Install OpenMP: brew install libomp + DEFINES += WITH_OMP + QMAKE_CXXFLAGS += -Xpreprocessor -fopenmp + INCLUDEPATH += /usr/local/opt/libomp/include + LIBS += -L/usr/local/opt/libomp/lib -lomp + } +} + win32 { # Fix error LNK2001: unresolved external symbol "struct lemon::Invalid const lemon::INVALID" (?INVALID@lemon@@3UInvalid@1@B) DEFINES += LEMON_ONLY_TEMPLATES