Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Sylvain Munaut | bd3abaa3b5 | |
Sylvain Munaut | c87749e7ee | |
Sylvain Munaut | 7a9166f905 | |
Sylvain Munaut | 27adfdd236 |
|
@ -83,7 +83,7 @@ endif()
|
||||||
if(NOT LIBOSMODSP_FOUND)
|
if(NOT LIBOSMODSP_FOUND)
|
||||||
message(STATUS "libosmodsp not found, using local checkout")
|
message(STATUS "libosmodsp not found, using local checkout")
|
||||||
set(LIBOSMODSP_INCLUDE_DIRS "libosmo-dsp/include/")
|
set(LIBOSMODSP_INCLUDE_DIRS "libosmo-dsp/include/")
|
||||||
set(LIBOSMODSP_LIBRARIES "")
|
set(LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES})
|
||||||
set(LIBOSMODSP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/cxvec.c ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/iqbal.c)
|
set(LIBOSMODSP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/cxvec.c ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/iqbal.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -118,6 +118,8 @@ if(NOT GNURADIO_CORE_FOUND)
|
||||||
message(FATAL_ERROR "GnuRadio Core required to compile iqbalance")
|
message(FATAL_ERROR "GnuRadio Core required to compile iqbalance")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
find_package(Doxygen)
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Setup the include and linker paths
|
# Setup the include and linker paths
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
|
@ -36,7 +36,7 @@ if(PYTHON_EXECUTABLE)
|
||||||
else(PYTHON_EXECUTABLE)
|
else(PYTHON_EXECUTABLE)
|
||||||
|
|
||||||
#use the built-in find script
|
#use the built-in find script
|
||||||
find_package(PythonInterp)
|
find_package(PythonInterp 2)
|
||||||
|
|
||||||
#and if that fails use the find program routine
|
#and if that fails use the find program routine
|
||||||
if(NOT PYTHONINTERP_FOUND)
|
if(NOT PYTHONINTERP_FOUND)
|
||||||
|
|
|
@ -114,7 +114,7 @@ macro(GR_SWIG_MAKE name)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#append additional include directories
|
#append additional include directories
|
||||||
find_package(PythonLibs)
|
find_package(PythonLibs 2)
|
||||||
list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
|
list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
|
||||||
list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
|
list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
|
||||||
list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
|
list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
|
@ -17,11 +17,6 @@
|
||||||
# the Free Software Foundation, Inc., 51 Franklin Street,
|
# the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
# Boston, MA 02110-1301, USA.
|
# Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
########################################################################
|
|
||||||
# Setup dependencies
|
|
||||||
########################################################################
|
|
||||||
find_package(Doxygen)
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Begin conditional configuration
|
# Begin conditional configuration
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
|
@ -25,6 +25,17 @@
|
||||||
#include <gr_io_signature.h>
|
#include <gr_io_signature.h>
|
||||||
#include "iqbalance_optimize_c.h"
|
#include "iqbalance_optimize_c.h"
|
||||||
|
|
||||||
|
#define GCC_VERSION ( \
|
||||||
|
__GNUC__ * 10000 + \
|
||||||
|
__GNUC_MINOR__ * 100 + \
|
||||||
|
__GNUC_PATCHLEVEL__ \
|
||||||
|
)
|
||||||
|
|
||||||
|
#if GCC_VERSION >= 40800
|
||||||
|
# define complex _Complex
|
||||||
|
# undef _GLIBCXX_HAVE_COMPLEX_H
|
||||||
|
#endif
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <osmocom/dsp/cxvec.h>
|
#include <osmocom/dsp/cxvec.h>
|
||||||
#include <osmocom/dsp/iqbal.h>
|
#include <osmocom/dsp/iqbal.h>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
# Include swig generation macros
|
# Include swig generation macros
|
||||||
########################################################################
|
########################################################################
|
||||||
find_package(SWIG)
|
find_package(SWIG)
|
||||||
find_package(PythonLibs)
|
find_package(PythonLibs 2)
|
||||||
if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
|
if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue