diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-12 11:23:22 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-12 11:23:22 -0500 |
| commit | 915fa3c0ab1bc863fa965c1edc773b528827aa96 (patch) | |
| tree | 4050769bd3fdcdbd8188db63262921c5df531e2c /gr-trellis | |
| parent | 53554ae38281bdd6524d8a75e6d91f286900e670 (diff) | |
| parent | 60c60b02cd1f22d7d52fcc5da313635fd8dbed01 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/swig/CMakeLists.txt
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index ffcba435ae..3463ba8037 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -199,8 +199,6 @@ if(ENABLE_PYTHON) include(GrPython) include(GrSwig) -set(GR_SWIG_TARGET_DEPS core_swig) - set(GR_SWIG_SOURCE_DEPS ${generated_trellis_includes} ${generated_trellis_swigs} |