From e6f1cce3f8e11506d870cdac3f6294bf59e36121 Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Fri, 18 Feb 2022 17:35:16 -0800 Subject: [PATCH] fix OSX pri files --- tools/jenkins/include/natron/OSX.pri | 14 +++++++------- tools/jenkins/include/natron/OSX_natron3.pri | 19 +++++++------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tools/jenkins/include/natron/OSX.pri b/tools/jenkins/include/natron/OSX.pri index d28aa92b7d..5fe8ef295c 100644 --- a/tools/jenkins/include/natron/OSX.pri +++ b/tools/jenkins/include/natron/OSX.pri @@ -1,14 +1,14 @@ boost { - LIBS += -lboost_serialization-mt + LIBS += -lboost_serialization-mt } shiboken { PKGCONFIG -= shiboken - PKGCONFIG -= pyside-py$$PYV - INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py$$PYV) - INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py$$PYV)/QtCore - INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py$$PYV)/QtGui - INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui) - LIBS += $$system(pkg-config --libs pyside-py$$PYV) + INCLUDEPATH += /opt/local/include/shiboken-$$PYVER + python3 { + LIBS += -L/opt/local/lib -lshiboken-cpython-$$PYVERNODOT-darwin + } else { + LIBS += -L/opt/local/lib -lshiboken-python$$PYVER + } } python { # required to link natron-python, which needs libintl diff --git a/tools/jenkins/include/natron/OSX_natron3.pri b/tools/jenkins/include/natron/OSX_natron3.pri index f9a410e4f7..0bcdb7fcd3 100644 --- a/tools/jenkins/include/natron/OSX_natron3.pri +++ b/tools/jenkins/include/natron/OSX_natron3.pri @@ -1,21 +1,16 @@ boost { - LIBS += -lboost_serialization-mt + LIBS += -lboost_serialization-mt } boost-serialization-lib: LIBS += -lboost_serialization-mt -pyside { - PKGCONFIG -= pyside - PKGCONFIG -= pyside-py$$PYV - INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py$$PYV) - INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py$$PYV)/QtCore - INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py$$PYV)/QtGui - INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui) - LIBS += $$system(pkg-config --libs pyside-py$$PYV) -} shiboken { PKGCONFIG -= shiboken PKGCONFIG -= shiboken-py$$PYV - INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken-py$$PYV) - LIBS += $$system(pkg-config --libs shiboken-py$$PYV) + INCLUDEPATH += /opt/local/include/shiboken-$$PYVER + python3 { + LIBS += -L/opt/local/lib -lshiboken-cpython-$$PYVERNODOT-darwin + } else { + LIBS += -L/opt/local/lib -lshiboken-python$$PYVER + } } python { # required to link natron-python, which needs libintl