Private
Public Access
2
0

swig: fix usage of SWIGPYTHON for python specific code

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-05-13 20:55:08 +00:00
parent f7169cc5c5
commit ef225dbe26
5 changed files with 8 additions and 6 deletions

View File

@@ -71,6 +71,8 @@ endif ()
find_package (SWIG)
if (SWIG_FOUND)
set (CMAKE_C_FLAGS -DSWIG=${SWIG_FOUND})
set (CMAKE_CXX_CFLAGS -DSWIG=${SWIG_FOUND})
include (${SWIG_USE_FILE})
add_subdirectory (python)

View File

@@ -124,7 +124,7 @@ maa_gpio_interrupt_handler(void* arg)
for (;;) {
ret = maa_gpio_wait_interrupt(dev->isr_value_fp);
if (ret == MAA_SUCCESS) {
#ifdef SWIG
#ifdef SWIGPYTHON
// In order to call a python object (all python functions are objects) we
// need to aquire the GIL (Global Interpreter Lock). This may not always be
// nessecary but especially if doing IO (like print()) python will segfault
@@ -202,7 +202,7 @@ maa_gpio_isr_exit(maa_gpio_context *dev)
{
maa_result_t ret = MAA_SUCCESS;
#ifdef SWIG
#ifdef SWIGPYTHON
// Dereference our Python call back function
Py_DECREF(dev->isr);
#endif

View File

@@ -55,7 +55,7 @@ maa_init()
if (plat != NULL) {
return MAA_ERROR_PLATFORM_ALREADY_INITIALISED;
}
#ifdef SWIG
#ifdef SWIGPYTHON
// Initialise python threads, this allows use to grab the GIL when we are
// required to do so
Py_InitializeEx(0);

View File

@@ -9,7 +9,7 @@ include_directories(
swig_add_module (pymaa python pymaa.i ${maa_LIB_SRCS})
swig_link_libraries (pymaa ${PYTHON_LIBRARIES})
set (CMAKE_C_FLAGS -DSWIG=${SWIG_FOUND})
set (CMAKE_C_FLAGS -DSWIGPYTHON=${SWIG_FOUND})
if (DOXYGEN_FOUND)
foreach (_file ${DOCFILES})