diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| m--------- | grextras | 0 | ||||
| -rw-r--r-- | include/gras/block.i | 2 | ||||
| -rw-r--r-- | include/gras/element.i | 2 | ||||
| -rw-r--r-- | include/gras/hier_block.i | 2 | ||||
| -rw-r--r-- | include/gras/sbuffer.i | 2 | ||||
| -rw-r--r-- | include/gras/tags.i | 2 | ||||
| -rw-r--r-- | include/gras/time_tag.i | 2 | ||||
| -rw-r--r-- | include/gras/top_block.i | 2 |
9 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d91fb6c..278941a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,6 @@ list(APPEND GRAS_INCLUDE_DIRS ${GRAS_SOURCE_DIR}/include) ######################################################################## # Paths for python ######################################################################## -list(APPEND GRAS_PYTHON_DIRS ${GRAS_SOURCE_DIR}/python) list(APPEND GRAS_PYTHON_DIRS ${GRAS_BINARY_DIR}/python) list(APPEND GRAS_PYTHON_DIRS ${GRAS_BINARY_DIR}/python/gras) list(APPEND GRAS_PYTHON_DIRS ${GRAS_BINARY_DIR}/python/gras/${CMAKE_BUILD_TYPE}) diff --git a/grextras b/grextras -Subproject a3eb8d0bc3723c88ecb1147d71486e30ce2250e +Subproject 4f4da5d98179514cbc937fb1f3c8141fb0f8d09 diff --git a/include/gras/block.i b/include/gras/block.i index ffb361c..2de2c98 100644 --- a/include/gras/block.i +++ b/include/gras/block.i @@ -3,7 +3,7 @@ #ifndef INCLUDED_GRAS_BLOCK_I #define INCLUDED_GRAS_BLOCK_I -%module GRAS_Block +%module (package="gras") GRAS_Block %{ #include <gras/block.hpp> diff --git a/include/gras/element.i b/include/gras/element.i index f8248f8..eb4d039 100644 --- a/include/gras/element.i +++ b/include/gras/element.i @@ -3,7 +3,7 @@ #ifndef INCLUDED_GRAS_ELEMENT_I #define INCLUDED_GRAS_ELEMENT_I -%module GRAS_Element +%module (package="gras") GRAS_Element %{ #include <gras/element.hpp> diff --git a/include/gras/hier_block.i b/include/gras/hier_block.i index c33156f..e3f8182 100644 --- a/include/gras/hier_block.i +++ b/include/gras/hier_block.i @@ -3,7 +3,7 @@ #ifndef INCLUDED_GRAS_HIER_BLOCK_I #define INCLUDED_GRAS_HIER_BLOCK_I -%module GRAS_HierBlock +%module (package="gras") GRAS_HierBlock %{ #include <gras/hier_block.hpp> diff --git a/include/gras/sbuffer.i b/include/gras/sbuffer.i index 69b4833..2e86d03 100644 --- a/include/gras/sbuffer.i +++ b/include/gras/sbuffer.i @@ -3,6 +3,8 @@ #ifndef INCLUDED_GRAS_SBUFFER_I #define INCLUDED_GRAS_SBUFFER_I +%module (package="gras") GRAS_SBuffer + %{ #include <gras/gras.hpp> #include <gras/sbuffer.hpp> diff --git a/include/gras/tags.i b/include/gras/tags.i index bf2bdb4..23634b0 100644 --- a/include/gras/tags.i +++ b/include/gras/tags.i @@ -3,6 +3,8 @@ #ifndef INCLUDED_GRAS_TAGS_I #define INCLUDED_GRAS_TAGS_I +%module (package="gras") GRAS_Tags + %{ #include <gras/tags.hpp> %} diff --git a/include/gras/time_tag.i b/include/gras/time_tag.i index 42deed7..5ffc099 100644 --- a/include/gras/time_tag.i +++ b/include/gras/time_tag.i @@ -3,6 +3,8 @@ #ifndef INCLUDED_GRAS_TIME_TAG_I #define INCLUDED_GRAS_TIME_TAG_I +%module (package="gras") GRAS_TimeTag + %{ #include <gras/time_tag.hpp> %} diff --git a/include/gras/top_block.i b/include/gras/top_block.i index cda01de..23a4275 100644 --- a/include/gras/top_block.i +++ b/include/gras/top_block.i @@ -3,7 +3,7 @@ #ifndef INCLUDED_GRAS_TOP_BLOCK_I #define INCLUDED_GRAS_TOP_BLOCK_I -%module GRAS_TopBlock +%module (package="gras") GRAS_TopBlock %{ #include <gras/top_block.hpp> |