summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2013-03-03 23:23:11 +0100
committerSylvain Munaut <tnt@246tNt.com>2013-03-04 00:01:20 +0100
commit9c7a3b93fe1da7222d1900f1df00fe1a250e55ca (patch)
tree71582045fb1cb2730bbc4176d9e5c1bd53f2ec63
parent05678aad9e9c3e09f05e32b06c3407528ce34371 (diff)
build: Fallback to local checkout if a system-wide libosmo-dsp isn't found
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--CMakeLists.txt9
-rw-r--r--lib/CMakeLists.txt2
2 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bff303f..42014d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,8 +76,15 @@ endif()
########################################################################
find_package(LibOsmoDSP)
+if(LIBOSMODSP_FOUND)
+ set(LIBOSMODSP_SOURCES "")
+endif()
+
if(NOT LIBOSMODSP_FOUND)
- message(FATAL_ERROR "libosmo-dsp required to compile iqbalance")
+ message(STATUS "libosmodsp not found, using local checkout")
+ set(LIBOSMODSP_INCLUDE_DIRS "libosmo-dsp/include/")
+ set(LIBOSMODSP_LIBRARIES "")
+ set(LIBOSMODSP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/cxvec.c ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/iqbal.c)
endif()
########################################################################
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2c4e2b9..207cf76 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -19,7 +19,7 @@
# Setup library
########################################################################
include(GrPlatform) #define LIB_SUFFIX
-add_library(gnuradio-iqbalance SHARED iqbalance_fix_cc.cc iqbalance_optimize_c.cc )
+add_library(gnuradio-iqbalance SHARED iqbalance_fix_cc.cc iqbalance_optimize_c.cc ${LIBOSMODSP_SOURCES})
target_link_libraries(gnuradio-iqbalance ${Boost_LIBRARIES} ${GRUEL_LIBRARIES} ${GNURADIO_CORE_LIBRARIES} ${LIBOSMODSP_LIBRARIES})
set_target_properties(gnuradio-iqbalance PROPERTIES DEFINE_SYMBOL "gnuradio_iqbalance_EXPORTS")