Commit 54ab77d8 authored by Julien Wintz's avatar Julien Wintz
Browse files

No trick needed to find SIP anymore, using the gnomon conda environment.

parent 52839cd8
......@@ -23,11 +23,6 @@ endif()
set_property(CACHE DTK_PYTHON_WRAPPER PROPERTY STRINGS "SWIG" "SIP" "BOTH")
if(DTK_PYTHON_WRAPPER MATCHES "SIP" OR DTK_PYTHON_WRAPPER MATCHES "BOTH")
if(APPLE)
set(SIP_DEFAULT_SIP_DIR "/System/Library/Frameworks/Python.framework/Versions/2.7/share/sip")
set(SIP_MODULE_DIR ${SIP_DEFAULT_SIP_DIR})
set(PYQT5_MODULE_DIR "${SIP_DEFAULT_SIP_DIR}/PyQt5")
endif()
find_package(SIP)
endif()
......
......@@ -443,7 +443,7 @@ namespace Namespace {
%QList_typemapsPtr(dtkCorePlugin *)
// %define %QList_typemaps(DATA_TYPE)
%define %QList_typemaps(DATA_TYPE)
%typemap(out) QList<DATA_TYPE> {
$result = PyList_New($1.size());
......@@ -468,7 +468,7 @@ namespace Namespace {
$input = list;
}
// %enddef // %QList_typemaps()
%enddef // %QList_typemaps()
%typemap(out) QStringList {
$result = PyList_New($1.size());
......@@ -576,7 +576,7 @@ public:
T2 second;
};
%define %QPair_typemaps(DATA_TYPE_1, DATA_TYPE_2)
// %define %QPair_typemaps(DATA_TYPE_1, DATA_TYPE_2)
%typemap(out) QPair<DATA_TYPE_1, DATA_TYPE_2> {
$result = PyTuple_New(2);
......@@ -586,7 +586,7 @@ public:
PyTuple_SET_ITEM($result, 1, obj2);
}
%enddef // %QPair_typemaps()
// %enddef // %QPair_typemaps()
%template(QPairStrStrList) QPair<QString, QStringList>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment