diff options
| author | Josh Blum | 2012-11-26 02:43:29 -0800 |
|---|---|---|
| committer | Josh Blum | 2012-11-26 02:43:29 -0800 |
| commit | a10cd5cedee2eb30e49980f9136d6844ceb7ace1 (patch) | |
| tree | ca5d14154c082b5772ce7ece57d767b5ab5a5918 /python | |
| parent | 4aa91c001ed4dbcae1c517672b39581c9ffd7e23 (diff) | |
| download | sandhi-a10cd5cedee2eb30e49980f9136d6844ceb7ace1.tar.gz sandhi-a10cd5cedee2eb30e49980f9136d6844ceb7ace1.tar.bz2 sandhi-a10cd5cedee2eb30e49980f9136d6844ceb7ace1.zip | |
various tweaks for submodule building and msvc
Diffstat (limited to 'python')
| -rw-r--r-- | python/gras/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | python/gras/GRAS_Block.i | 3 | ||||
| -rw-r--r-- | python/gras/GRAS_IOSignature.i | 3 | ||||
| -rw-r--r-- | python/gras/__init__.py | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/python/gras/CMakeLists.txt b/python/gras/CMakeLists.txt index 2ffdfc8..e3724c9 100644 --- a/python/gras/CMakeLists.txt +++ b/python/gras/CMakeLists.txt @@ -22,12 +22,14 @@ GR_SWIG_MAKE(GRAS_Block GRAS_Block.i) GR_SWIG_MAKE(GRAS_HierBlock GRAS_HierBlock.i) GR_SWIG_MAKE(GRAS_ThreadPool GRAS_ThreadPool.i) GR_SWIG_MAKE(GRAS_SBuffer GRAS_SBuffer.i) +GR_SWIG_MAKE(GRAS_IOSignature GRAS_IOSignature.i) GR_SWIG_INSTALL( TARGETS GRAS_Block GRAS_HierBlock GRAS_ThreadPool GRAS_SBuffer + GRAS_IOSignature DESTINATION ${GR_PYTHON_DIR}/gras COMPONENT ${GRAS_COMP_PYTHON} ) diff --git a/python/gras/GRAS_Block.i b/python/gras/GRAS_Block.i index ed8576c..8c7ab0e 100644 --- a/python/gras/GRAS_Block.i +++ b/python/gras/GRAS_Block.i @@ -78,7 +78,7 @@ struct PyGILPhondler #include <iostream> %} -%include <gras/io_signature.i> +%import <gras/io_signature.i> %include <gras/block.i> //////////////////////////////////////////////////////////////////////// @@ -187,6 +187,7 @@ struct BlockPython : Block import numpy import traceback from GRAS_Utils import pointer_to_ndarray +from GRAS_IOSignature import IOSignature from PMC import * def sig_to_dtype_sig(sig): diff --git a/python/gras/GRAS_IOSignature.i b/python/gras/GRAS_IOSignature.i new file mode 100644 index 0000000..36f51dd --- /dev/null +++ b/python/gras/GRAS_IOSignature.i @@ -0,0 +1,3 @@ +// Copyright (C) by Josh Blum. See LICENSE.txt for licensing information. + +%include <gras/io_signature.i> diff --git a/python/gras/__init__.py b/python/gras/__init__.py index 82dcb40..e200273 100644 --- a/python/gras/__init__.py +++ b/python/gras/__init__.py @@ -1,7 +1,8 @@ # Copyright (C) by Josh Blum. See LICENSE.txt for licensing information. from PMC import * -from GRAS_Block import Block, Tag, IOSignature +from GRAS_IOSignature import IOSignature +from GRAS_Block import Block, Tag from GRAS_HierBlock import HierBlock, TopBlock from GRAS_ThreadPool import ThreadPoolConfig, ThreadPool from GRAS_SBuffer import SBufferConfig, SBuffer |