Compare commits

...

4 Commits

Author SHA1 Message Date
Sylvain Munaut bd3abaa3b5 build: doxygen package needs to be detetected before the doxygen is used
Based on a patch for gr-osmosdr by Jaroslav Škarvada <jskarvad@redhat.com>
Thanks to wk@ire.pw.edu.pl for reporting the issue in gr-iqbal.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
2013-09-19 21:18:01 +02:00
Sylvain Munaut c87749e7ee lib: hack to make "float complex" works on newer GCC
I _like_ the "float complex" syntax and it's valid in C and I won't
go change all my C project to make it work with C++ ...

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
2013-09-09 15:42:00 +02:00
Sylvain Munaut 7a9166f905 build: Force cmake to find PythonInterp and PythonLibs v2.x
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
2013-07-26 21:08:56 +02:00
Sylvain Munaut 27adfdd236 build: Add library link to fftw3f when building against bundled libosmo-dsp
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
2013-07-26 20:17:05 +02:00
6 changed files with 17 additions and 9 deletions

View File

@ -83,7 +83,7 @@ endif()
if(NOT LIBOSMODSP_FOUND)
message(STATUS "libosmodsp not found, using local checkout")
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)
endif()
@ -118,6 +118,8 @@ if(NOT GNURADIO_CORE_FOUND)
message(FATAL_ERROR "GnuRadio Core required to compile iqbalance")
endif()
find_package(Doxygen)
########################################################################
# Setup the include and linker paths
########################################################################

View File

@ -36,7 +36,7 @@ if(PYTHON_EXECUTABLE)
else(PYTHON_EXECUTABLE)
#use the built-in find script
find_package(PythonInterp)
find_package(PythonInterp 2)
#and if that fails use the find program routine
if(NOT PYTHONINTERP_FOUND)

View File

@ -114,7 +114,7 @@ macro(GR_SWIG_MAKE name)
endif()
#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_DIRS})
list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})

View File

@ -17,11 +17,6 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
########################################################################
# Setup dependencies
########################################################################
find_package(Doxygen)
########################################################################
# Begin conditional configuration
########################################################################

View File

@ -25,6 +25,17 @@
#include <gr_io_signature.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" {
#include <osmocom/dsp/cxvec.h>
#include <osmocom/dsp/iqbal.h>

View File

@ -21,7 +21,7 @@
# Include swig generation macros
########################################################################
find_package(SWIG)
find_package(PythonLibs)
find_package(PythonLibs 2)
if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
return()
endif()