diff options
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | tikzit.pro | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d6fc65a..07a6a6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ install: - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install qt5' - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew link --force qt5' - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install poppler --with-qt' - - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew link --force poppler' # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || sudo port -N -k install qt56' # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || export PATH=/opt/local/libexec/qt5/bin:$PATH' @@ -116,7 +116,12 @@ INCLUDEPATH += src src/gui src/data win32 { INCLUDEPATH += win32-deps/include LIBS += -L"$$PWD/win32-deps/bin" -} +} + +macx { + INCLUDEPATH += /usr/local/opt/poppler/include + LIBS += -L/usr/local/opt/poppler/lib +} LIBS += -lpoppler-qt5 |