Skip to content

Commit

Permalink
fix OSX pri files
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Feb 19, 2022
1 parent cdab356 commit e6f1cce
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
14 changes: 7 additions & 7 deletions tools/jenkins/include/natron/OSX.pri
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 7 additions & 12 deletions tools/jenkins/include/natron/OSX_natron3.pri
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit e6f1cce

Please sign in to comment.