diff options
| author | Jacob Gilbert <mrjacobagilbert@gmail.com> | 2016-03-29 07:23:23 -0700 |
|---|---|---|
| committer | Jacob Gilbert <mrjacobagilbert@gmail.com> | 2016-03-29 07:23:23 -0700 |
| commit | 9c00e62d9654e0a7f4428f62f398106861d7165d (patch) | |
| tree | 2b307ea87a5e4169e6613094d731727d1feff76f /gr-utils/python/modtool/gr-newmod | |
| parent | 8350ee94c0183356f1ab6f0e5f666728225266fe (diff) | |
Updated gr_modtool CMake files to properly handle template expansion. Previously template expansion failed due to incorrectly configured python paths
Diffstat (limited to 'gr-utils/python/modtool/gr-newmod')
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index 0513f44086..9b41b99f14 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -112,6 +112,7 @@ find_package(Doxygen) # API compatible version required. set(GR_REQUIRED_COMPONENTS RUNTIME) find_package(Gnuradio "3.7.2" REQUIRED) +list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile howto") diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake index 188c40480b..5bad57c51e 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake @@ -363,6 +363,7 @@ macro(GR_EXPAND_X_H component root) import sys, os, re sys.path.append('${GR_RUNTIME_PYTHONPATH}') +sys.path.append('${CMAKE_SOURCE_DIR}/python') os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}' os.chdir('${CMAKE_CURRENT_BINARY_DIR}') @@ -406,6 +407,7 @@ macro(GR_EXPAND_X_CC_H component root) import sys, os, re sys.path.append('${GR_RUNTIME_PYTHONPATH}') +sys.path.append('${CMAKE_SOURCE_DIR}/python') os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}' os.chdir('${CMAKE_CURRENT_BINARY_DIR}') @@ -466,6 +468,7 @@ macro(GR_EXPAND_X_CC_H_IMPL component root) import sys, os, re sys.path.append('${GR_RUNTIME_PYTHONPATH}') +sys.path.append('${CMAKE_SOURCE_DIR}/python') os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}' os.chdir('${CMAKE_CURRENT_BINARY_DIR}') |