diff options
| author | mormj <34754695+mormj@users.noreply.github.com> | 2021-11-24 11:48:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 11:48:10 -0500 |
| commit | d3e49a4e0c72ab81d18bf479d2f6cdccf443b616 (patch) | |
| tree | 45576799fd50fe01dc894ce89c53682f8ddf680d /cmake | |
| parent | 6a4eef30b0ff16006ec31a901937619ff136737a (diff) | |
modtool: move OOTs equal to components for 3.10
* modtool: move OOTs equal to components for 3.10
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* pybind: update some python dir references
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* cmake: have pybind address the correct header
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* runtime: extend the python search path
allow OOT modules to be installed in other places in PYTHONPATH that
have a gnuradio directory
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* modtool: update python paths for rm
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* modtool: minor fixes for new dir structure
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* modtool: update the installed cmake targets
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* modtool: add include(CMakePackageConfigHelpers)
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
* modtool: test_modules dir under gnuradio
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrPybind.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/Modules/GrPybind.cmake b/cmake/Modules/GrPybind.cmake index a000f8e5e4..202649161f 100644 --- a/cmake/Modules/GrPybind.cmake +++ b/cmake/Modules/GrPybind.cmake @@ -206,8 +206,12 @@ foreach(file ${files}) # If no header filename is specified (set to empty or "None") # OR If hash is set to 0, then ignore the check as well - if (NOT ${header_filename} STREQUAL "None" AND NOT ${header_file_hash} STREQUAL "0") + if (NOT ${header_filename} STREQUAL "None" AND NOT ${header_file_hash} STREQUAL "0") set(header_full_path ${CMAKE_CURRENT_SOURCE_DIR}/${updir}/include/${name}/${header_filename}) # NOTE OOT version does not have gnuradio/ here + if(NOT EXISTS ${header_full_path}) + set(header_full_path ${CMAKE_CURRENT_SOURCE_DIR}/${updir}/include/gnuradio/${name}/${header_filename}) + ENDIF() + file(MD5 ${header_full_path} calc_hash) # message(STATUS ${ii} " " ${calc_hash} " " ${saved_hash}) if (NOT ${calc_hash} STREQUAL ${header_file_hash}) |