From 368e9d259534119c40980276daca4de0e0584906 Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Wed, 26 Oct 2016 03:48:43 +0200 Subject: [PATCH] Debian package build: re-integrated SDRDaemonFEC --- .gitignore | 1 + cm256cc/CMakeLists.txt | 17 ++++++----------- plugins/samplesource/CMakeLists.txt | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f46606f55..017a1a37c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ debian/sdrangel/* debian/sdrangel.substvars debian/files debian/sdrangel.debhelper.log +debian/debhelper-build-stamp obj-x86_64-linux-gnu/* diff --git a/cm256cc/CMakeLists.txt b/cm256cc/CMakeLists.txt index 8a4a5feef..660b4309d 100644 --- a/cm256cc/CMakeLists.txt +++ b/cm256cc/CMakeLists.txt @@ -1,18 +1,16 @@ project(cm256cc) -set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11" ) -set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11" ) -add_definitions(-DNO_RESTRICT) - EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE ) -message( STATUS "Architecture: ${ARCHITECTURE}" ) +message( STATUS "CM256cc: Architecture: ${ARCHITECTURE}" ) if(${ARCHITECTURE} MATCHES "x86_64|AMD64|x86") - SET(USE_SIMD "SSSE3" CACHE STRING "Use SIMD SSSE3 instructions") + SET(USE_SIMD "SSSE3") elseif(${ARCHITECTURE} MATCHES "armv7l") - SET(USE_SIMD "NEON" CACHE STRING "Use SIMD NEON instructions") + SET(USE_SIMD "NEON") endif() +message( STATUS "CM256cc: use SIMD: ${USE_SIMD}" ) + if(USE_SIMD MATCHES SSSE3) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mssse3" ) @@ -35,7 +33,7 @@ elseif(USE_SIMD MATCHES NEON) add_definitions(-DUSE_NEON) endif() else() - message(STATUS "Unsupported architecture") + message(STATUS "CM256cc: Unsupported architecture") return() endif() @@ -61,7 +59,4 @@ add_library(cm256cc SHARED ${cm256cc_SOURCES} ) -target_link_libraries(cm256cc -) - install(TARGETS cm256cc DESTINATION lib) diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt index 80d75dc73..22ac63092 100644 --- a/plugins/samplesource/CMakeLists.txt +++ b/plugins/samplesource/CMakeLists.txt @@ -53,6 +53,7 @@ if(CM256CC_FOUND) endif(CM256CC_FOUND) if (BUILD_DEBIAN) + add_subdirectory(sdrdaemonfec) add_subdirectory(airspy) add_subdirectory(hackrf) add_subdirectory(rtlsdr)