diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-10-10 22:02:42 -0700 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-10-12 18:37:16 +0200 |
| commit | ea0ee503a144aaf07a684a2dfaac58c89dbdb78d (patch) | |
| tree | 30e1792b8178430bb080e7a9632dbdfc2398aad4 /cmake | |
| parent | c4b4426a4aedb0d7b9a94e17d70941826e5c8bf8 (diff) | |
cmake: Remove superfluous code for old SWIG
We had a hack for working around a bug in old SWIG, but old SWIG is no
longer supported. We now require SWIG 3.0 and the bug only happened in
pre-3.0.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 87d5e60d8a..2ec2da2a95 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -105,37 +105,6 @@ endfunction(GR_SWIG_MAKE_DOCS) macro(GR_SWIG_MAKE name) set(ifiles ${ARGN}) - # Take care of a SWIG < 3.0 bug with handling std::vector<size_t>, - # by mapping to the correct sized type on the runtime system, one - # of "unsigned int", "unsigned long", or "unsigned long long". - # Compare the sizeof(size_t) with the sizeof the other types, and - # pick the first one in the list with the same sizeof. The logic - # in gnuradio-runtime/swig/gr_types.i handles the rest. It is - # probably not necessary to do this assignment all of the time, - # but it's easier to do it this way than to figure out the - # conditions when it is necessary -- and doing it this way won't - # hurt. This bug seems to have been fixed with SWIG >= 3.0, and - # mostly happens when not doing a native build (e.g., on Mac OS X - # when using a 64-bit CPU but building for 32-bit). - - if(SWIG_VERSION VERSION_LESS "3.0.0") - include(CheckTypeSize) - check_type_size("size_t" SIZEOF_SIZE_T) - check_type_size("unsigned int" SIZEOF_UINT) - check_type_size("unsigned long" SIZEOF_UL) - check_type_size("unsigned long long" SIZEOF_ULL) - - if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT}) - list(APPEND GR_SWIG_FLAGS -DSIZE_T_UINT) - elseif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UL}) - list(APPEND GR_SWIG_FLAGS -DSIZE_T_UL) - elseif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_ULL}) - list(APPEND GR_SWIG_FLAGS -DSIZE_T_ULL) - else() - message(FATAL_ERROR "GrSwig: Unable to find replace for std::vector<size_t>; this should never happen!") - endif() - endif() - #do swig doc generation if specified if(GR_SWIG_DOC_FILE) set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS}) |