diff options
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 46 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 9 |
3 files changed, 46 insertions, 39 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 9fca29a4fc..d4dcf958a8 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -22,6 +22,8 @@ IF(DEFINED __INCLUDED_GR_SWIG_CMAKE) ENDIF() SET(__INCLUDED_GR_SWIG_CMAKE TRUE) +INCLUDE(GrPython) + ######################################################################## # Build a swig target for the common gnuradio use case. Usage: # GR_SWIG_MAKE(target ifile ifile ifile...) @@ -36,8 +38,18 @@ SET(__INCLUDED_GR_SWIG_CMAKE TRUE) MACRO(GR_SWIG_MAKE name) SET(ifiles ${ARGN}) + #determine include dependencies for swig file + EXECUTE_PROCESS( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/get_swig_deps.py + "${ifiles}" "${GR_SWIG_INCLUDE_DIRS}" + OUTPUT_STRIP_TRAILING_WHITESPACE + OUTPUT_VARIABLE SWIG_MODULE_${name}_EXTRA_DEPS + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + + #append the specified include directories INCLUDE_DIRECTORIES(${GR_SWIG_INCLUDE_DIRS}) - SET(SWIG_MODULE_${name}_EXTRA_DEPS ${GR_SWIG_SOURCE_DEPS}) + LIST(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${GR_SWIG_SOURCE_DEPS}) FIND_PACKAGE(PythonLibs) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) @@ -88,3 +100,35 @@ MACRO(GR_SWIG_INSTALL) ENDFOREACH(name) ENDMACRO(GR_SWIG_INSTALL) + +######################################################################## +# Generate a python file that can determine swig dependencies +######################################################################## +FILE(WRITE ${CMAKE_BINARY_DIR}/get_swig_deps.py " + +import os, sys, re + +include_matcher = re.compile('(#|%)include\\s*(<(.*)>|\"(.*)\")') +include_dirs = sys.argv[2].split(';') + +def get_swig_incs(file_path): + for line in open(file_path, 'r').readlines(): + m = include_matcher.match(line) + if not m: continue + yield m.groups()[2] or m.groups()[3] + +def get_swig_deps(file_path, level): + deps = list() + for inc_file in get_swig_incs(file_path): + for inc_dir in include_dirs: + inc_path = os.path.join(inc_dir, inc_file) + if not os.path.exists(inc_path): continue + deps.append(inc_path) + if level > 1: deps.extend(get_swig_deps(inc_path, level-1)) + return deps + +if __name__ == '__main__': + ifiles = sys.argv[1].split(';') + deps = sum([get_swig_deps(ifile, 3) for ifile in ifiles], []) + print(';'.join(set(deps))) +") diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 0d10245bf7..6704b6e682 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -42,41 +42,13 @@ SET(GR_SWIG_LIBRARIES gnuradio-core) # smaller pieces for the compiler to digest. prior to this change, on # X86_64, g++'s resident set size was 650MB! # ---------------------------------------------------------------- -FILE(GLOB GR_SWIG_SOURCE_DEPS - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime/*.i" - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime/*.h" -) -GR_SWIG_MAKE(gnuradio_core_runtime gnuradio_core_runtime.i) -UNSET(GR_SWIG_SOURCE_DEPS) -FILE(GLOB GR_SWIG_SOURCE_DEPS - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/general/*.i" - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/general/*.h" -) +GR_SWIG_MAKE(gnuradio_core_runtime gnuradio_core_runtime.i) GR_SWIG_MAKE(gnuradio_core_general gnuradio_core_general.i) -UNSET(GR_SWIG_SOURCE_DEPS) - -SET(GR_SWIG_TARGET_DEPS gengen_generated) GR_SWIG_MAKE(gnuradio_core_gengen gnuradio_core_gengen.i) -UNSET(GR_SWIG_TARGET_DEPS) - -SET(GR_SWIG_TARGET_DEPS filter_generated) GR_SWIG_MAKE(gnuradio_core_filter gnuradio_core_filter.i) -UNSET(GR_SWIG_TARGET_DEPS) - -FILE(GLOB GR_SWIG_SOURCE_DEPS - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/io/*.i" - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/io/*.h" -) GR_SWIG_MAKE(gnuradio_core_io gnuradio_core_io.i) -UNSET(GR_SWIG_SOURCE_DEPS) - -FILE(GLOB GR_SWIG_SOURCE_DEPS - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/hier/*.i" - "${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/hier/*.h" -) GR_SWIG_MAKE(gnuradio_core_hier gnuradio_core_hier.i) -UNSET(GR_SWIG_SOURCE_DEPS) GR_SWIG_INSTALL(TARGETS gnuradio_core_runtime diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index e9222b5fdb..6484cc173c 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -200,16 +200,7 @@ SET(GR_SWIG_INCLUDE_DIRS ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GR_DIGITAL_SWIG_INCLUDE_DIRS} ) - SET(GR_SWIG_LIBRARIES gnuradio-trellis) -FILE(GLOB GR_SWIG_SOURCE_DEPS - "${CMAKE_CURRENT_SOURCE_DIR}/*.i" - "${CMAKE_CURRENT_SOURCE_DIR}/*.h" -) -LIST(APPEND GR_SWIG_SOURCE_DEPS - ${generated_trellis_swigs} - ${generated_trellis_includes} -) GR_SWIG_MAKE(trellis trellis.i) GR_SWIG_INSTALL( |