Reworked ARM Neon detection and remote plugins inclusion in the build

pull/724/head
f4exb 2020-11-23 21:16:25 +01:00
rodzic f155d63580
commit 4059a0be27
9 zmienionych plików z 15 dodań i 29 usunięć

Wyświetl plik

@ -196,8 +196,14 @@ if (ARCHITECTURE_ARM)
endif() endif()
endif() endif()
# Extensions detection for ARM
check_symbol_exists("__ARM_NEON" "" HAS_NEON)
if (HAS_NEON)
message(STATUS "ARM Neon extensions enabled")
add_compile_definitions(USE_NEON)
endif()
# This is quite basic detection, can be extended if needed # This is quite basic detection, can be extended if needed
detect_extensions(ARM_NEON)
detect_extensions(AVX512F) detect_extensions(AVX512F)
detect_extensions(AVX2 HAS_AVX512F) detect_extensions(AVX2 HAS_AVX512F)
detect_extensions(AVX HAS_AVX2) detect_extensions(AVX HAS_AVX2)

Wyświetl plik

@ -18,9 +18,9 @@ if(LIBDSDCC_FOUND AND LIBMBE_FOUND)
add_subdirectory(demoddsd) add_subdirectory(demoddsd)
endif(LIBDSDCC_FOUND AND LIBMBE_FOUND) endif(LIBDSDCC_FOUND AND LIBMBE_FOUND)
if(CM256CC_FOUND) if (CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
add_subdirectory(remotesink) add_subdirectory(remotesink)
endif(CM256CC_FOUND) endif()
if (CODEC2_FOUND) if (CODEC2_FOUND)
add_subdirectory(demodfreedv) add_subdirectory(demodfreedv)

Wyświetl plik

@ -1,10 +1,5 @@
project(remotesink) project(remotesink)
if (ARCHITECTURE_ARM64)
message(STATUS "Compiling RemoteSink for ARM64 with USE_NEON definition")
add_compile_definitions(USE_NEON)
endif()
set(remotesink_SOURCES set(remotesink_SOURCES
remotesink.cpp remotesink.cpp
remotesinkbaseband.cpp remotesinkbaseband.cpp

Wyświetl plik

@ -11,9 +11,9 @@ add_subdirectory(udpsource)
add_subdirectory(localsource) add_subdirectory(localsource)
add_subdirectory(filesource) add_subdirectory(filesource)
if(CM256CC_FOUND) if (CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
add_subdirectory(remotesource) add_subdirectory(remotesource)
endif(CM256CC_FOUND) endif()
if (OpenCV_FOUND) if (OpenCV_FOUND)
add_subdirectory(modatv) add_subdirectory(modatv)

Wyświetl plik

@ -1,10 +1,5 @@
project(remotesource) project(remotesource)
if (ARCHITECTURE_ARM64)
message(STATUS "Compiling RemoteSource for ARM64 with USE_NEON definition")
add_compile_definitions(USE_NEON)
endif()
set(remotesource_SOURCES set(remotesource_SOURCES
remotesource.cpp remotesource.cpp
remotesourcebaseband.cpp remotesourcebaseband.cpp

Wyświetl plik

@ -5,9 +5,9 @@ add_subdirectory(fileoutput)
add_subdirectory(localoutput) add_subdirectory(localoutput)
add_subdirectory(audiooutput) add_subdirectory(audiooutput)
if(CM256CC_FOUND) if (CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
add_subdirectory(remoteoutput) add_subdirectory(remoteoutput)
endif(CM256CC_FOUND) endif()
if(ENABLE_BLADERF AND LIBBLADERF_FOUND) if(ENABLE_BLADERF AND LIBBLADERF_FOUND)
add_subdirectory(bladerf1output) add_subdirectory(bladerf1output)

Wyświetl plik

@ -1,10 +1,5 @@
project(remoteoutput) project(remoteoutput)
if (ARCHITECTURE_ARM64)
message(STATUS "Compiling RemoteOutput for ARM64 with USE_NEON definition")
add_compile_definitions(USE_NEON)
endif()
set(remoteoutput_SOURCES set(remoteoutput_SOURCES
remoteoutput.cpp remoteoutput.cpp
remoteoutputplugin.cpp remoteoutputplugin.cpp

Wyświetl plik

@ -4,9 +4,9 @@ add_subdirectory(fileinput)
add_subdirectory(testsource) add_subdirectory(testsource)
add_subdirectory(localinput) add_subdirectory(localinput)
if(CM256CC_FOUND) if (CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
add_subdirectory(remoteinput) add_subdirectory(remoteinput)
endif(CM256CC_FOUND) endif()
if(ENABLE_AIRSPY AND LIBAIRSPY_FOUND) if(ENABLE_AIRSPY AND LIBAIRSPY_FOUND)
add_subdirectory(airspy) add_subdirectory(airspy)

Wyświetl plik

@ -1,10 +1,5 @@
project(remoteinput) project(remoteinput)
if (ARCHITECTURE_ARM64)
message(STATUS "Compiling RemoteInput for ARM64 with USE_NEON definition")
add_compile_definitions(USE_NEON)
endif()
set(remoteinput_SOURCES set(remoteinput_SOURCES
remoteinputbuffer.cpp remoteinputbuffer.cpp
remoteinputudphandler.cpp remoteinputudphandler.cpp