diff options
| author | Johnathan Corgan | 2012-12-04 09:22:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-12-04 09:22:52 -0800 |
| commit | cf18523a45c74be8a53ab95d3bfcdd81a143ebb8 (patch) | |
| tree | 0cd1d346094dc7954790bd5135d3e4a7407905f5 | |
| parent | ef74b48c155bfcec2f560c9a4a23592814699eda (diff) | |
| parent | e26d2cf197aeb077f321c73e7a057a58d7117f38 (diff) | |
| download | gnuradio-cf18523a45c74be8a53ab95d3bfcdd81a143ebb8.tar.gz gnuradio-cf18523a45c74be8a53ab95d3bfcdd81a143ebb8.tar.bz2 gnuradio-cf18523a45c74be8a53ab95d3bfcdd81a143ebb8.zip | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 10 | ||||
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 3d1c5d47f..b9bf0bb0b 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -205,21 +205,25 @@ file(WRITE ${CMAKE_BINARY_DIR}/get_swig_deps.py " import os, sys, re -include_matcher = re.compile('[#|%]include\\s*[<|\"](.*)[>|\"]') +i_include_matcher = re.compile('%(include|import)\\s*[<|\"](.*)[>|\"]') +h_include_matcher = re.compile('#(include)\\s*[<|\"](.*)[>|\"]') include_dirs = sys.argv[2].split(';') def get_swig_incs(file_path): + if file_path.endswith('.i'): matcher = i_include_matcher + else: matcher = h_include_matcher file_contents = open(file_path, 'r').read() - return include_matcher.findall(file_contents, re.MULTILINE) + return matcher.findall(file_contents, re.MULTILINE) def get_swig_deps(file_path, level): deps = [file_path] if level == 0: return deps - for inc_file in get_swig_incs(file_path): + for keyword, 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.extend(get_swig_deps(inc_path, level-1)) + break #found, we dont search in lower prio inc dirs return deps if __name__ == '__main__': diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 44f099e07..2f06791ca 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -61,6 +61,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier + ${Boost_INCLUDE_DIRS} ) GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 72a2534f7..734547131 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -25,10 +25,9 @@ include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) set(GR_SWIG_INCLUDE_DIRS - ${Boost_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} ) set(GR_SWIG_LIBRARIES gnuradio-core) |