diff options
| -rw-r--r-- | cmake/Modules/FindICE-3.5.cmake | 36 | ||||
| -rw-r--r-- | cmake/Toolchains/oe-sdk_cross.cmake | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/block.cc | 1 |
3 files changed, 28 insertions, 11 deletions
diff --git a/cmake/Modules/FindICE-3.5.cmake b/cmake/Modules/FindICE-3.5.cmake index 7ac53c94e1..d4421abbad 100644 --- a/cmake/Modules/FindICE-3.5.cmake +++ b/cmake/Modules/FindICE-3.5.cmake @@ -90,17 +90,33 @@ if(ICE_ICE AND ICE_ICEUTIL) ${ICE_ICEUTIL} ) - FIND_PROGRAM(ICE_SLICE2CPP slice2cpp - HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/) - FIND_PROGRAM(ICE_SLICE2PY slice2py - HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/) - - # Check that the ICE Python package is installed - include(GrPython) - GR_PYTHON_CHECK_MODULE("Ice >= 3.5" Ice "Ice.stringVersion() >= '3.5.0'" PYTHON_ICE_FOUND) - if(PYTHON_ICE_FOUND) + if(CMAKE_CROSSCOMPILING) + # When cross-compiling, we set up the environment/toolchain to put + # the right slice2cpp/py in the path. We just need to grab that here. + FIND_PROGRAM(ICE_SLICE2CPP slice2cpp) + FIND_PROGRAM(ICE_SLICE2PY slice2py) + + # We also don't need to look for Python in this case, so just + # force this to TRUE here. set(ICE_FOUND TRUE) - endif(PYTHON_ICE_FOUND) + + else(CMAKE_CROSSCOMPILING) + + FIND_PROGRAM(ICE_SLICE2CPP slice2cpp + HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/) + FIND_PROGRAM(ICE_SLICE2PY slice2py + HINTS ${CMAKE_INSTALL_PREFIX}/bin ${ICE_MANUAL_INSTALL_PATH}/bin/) + + # Check that the ICE Python package is installed + include(GrPython) + GR_PYTHON_CHECK_MODULE("Ice >= 3.5" Ice "Ice.stringVersion() >= '3.5.0'" PYTHON_ICE_FOUND) + if(PYTHON_ICE_FOUND) + set(ICE_FOUND TRUE) + endif(PYTHON_ICE_FOUND) + endif(CMAKE_CROSSCOMPILING) + + message(STATUS " SLICE2CPP: ${ICE_SLICE2CPP}") + message(STATUS " SLICE2PY: ${ICE_SLICE2PY}") if(ICE_FOUND) message(STATUS "Ice-3.5 found") diff --git a/cmake/Toolchains/oe-sdk_cross.cmake b/cmake/Toolchains/oe-sdk_cross.cmake index ea77815c96..2a01d8f79f 100644 --- a/cmake/Toolchains/oe-sdk_cross.cmake +++ b/cmake/Toolchains/oe-sdk_cross.cmake @@ -5,7 +5,7 @@ set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) #same flags for C sources set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) #same flags for C sources set( CMAKE_LIBRARY_PATH ${OECORE_TARGET_SYSROOT}/usr/lib ) -set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_NATIVE_SYSROOT} $ENV{OECORE_TARGET_SYSROOT} ) +set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} ) set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc index 7a1364def9..c8cb5f908e 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -30,6 +30,7 @@ #include <gnuradio/buffer.h> #include <gnuradio/prefs.h> #include <gnuradio/config.h> +#include <gnuradio/rpcregisterhelpers.h> #include <stdexcept> #include <iostream> |