From b8bc942b8403d230db6a806db0d57ad41c5b2382 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Wed, 30 Mar 2022 17:33:47 +0200 Subject: [PATCH] cmake bugfix --- decoder_modules/m17_decoder/CMakeLists.txt | 8 ++++++++ source_modules/airspy_source/CMakeLists.txt | 4 ++-- source_modules/airspyhf_source/CMakeLists.txt | 4 ++-- source_modules/hackrf_source/CMakeLists.txt | 4 ++-- source_modules/plutosdr_source/CMakeLists.txt | 4 ++-- source_modules/rtl_sdr_source/CMakeLists.txt | 4 ++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/decoder_modules/m17_decoder/CMakeLists.txt b/decoder_modules/m17_decoder/CMakeLists.txt index d260c91b..7fd7879c 100644 --- a/decoder_modules/m17_decoder/CMakeLists.txt +++ b/decoder_modules/m17_decoder/CMakeLists.txt @@ -23,7 +23,15 @@ if (MSVC) target_link_directories(m17_decoder PRIVATE "C:/Program Files/codec2/lib") target_link_libraries(m17_decoder PRIVATE libcodec2) +elseif (ANDROID) + target_include_directories(m17_decoder PUBLIC + /mnt/android_sdr/codec2/src + /mnt/android_sdr/codec2/build_${ANDROID_ABI}/ + ) + target_link_libraries(m17_decoder PUBLIC + /mnt/android_sdr/output/codec2/${ANDROID_ABI}/libcodec2.so + ) else (MSVC) find_package(PkgConfig) diff --git a/source_modules/airspy_source/CMakeLists.txt b/source_modules/airspy_source/CMakeLists.txt index 4884dc72..b206da92 100644 --- a/source_modules/airspy_source/CMakeLists.txt +++ b/source_modules/airspy_source/CMakeLists.txt @@ -25,12 +25,12 @@ if (MSVC) target_link_libraries(airspy_source PRIVATE airspy) elseif (ANDROID) - target_include_directories(sdrpp_core PUBLIC + target_include_directories(airspy_source PUBLIC /mnt/android_sdr/libusb/libusb /mnt/android_sdr/airspyone_host/libairspy/src ) - target_link_libraries(sdrpp_core PUBLIC + target_link_libraries(airspy_source PUBLIC /mnt/android_sdr/output/libusb/${ANDROID_ABI}/libusb1.0.so /mnt/android_sdr/output/libairspy/${ANDROID_ABI}/libairspy.so ) diff --git a/source_modules/airspyhf_source/CMakeLists.txt b/source_modules/airspyhf_source/CMakeLists.txt index 5a52b091..03446ad9 100644 --- a/source_modules/airspyhf_source/CMakeLists.txt +++ b/source_modules/airspyhf_source/CMakeLists.txt @@ -25,12 +25,12 @@ if (MSVC) target_link_libraries(airspyhf_source PRIVATE airspyhf) elseif (ANDROID) - target_include_directories(sdrpp_core PUBLIC + target_include_directories(airspyhf_source PUBLIC /mnt/android_sdr/libusb/libusb /mnt/android_sdr/airspyhf/libairspyhf/src ) - target_link_libraries(sdrpp_core PUBLIC + target_link_libraries(airspyhf_source PUBLIC /mnt/android_sdr/output/libusb/${ANDROID_ABI}/libusb1.0.so /mnt/android_sdr/output/libairspyhf/${ANDROID_ABI}/libairspyhf.so ) diff --git a/source_modules/hackrf_source/CMakeLists.txt b/source_modules/hackrf_source/CMakeLists.txt index 3fe78b54..6b69c751 100644 --- a/source_modules/hackrf_source/CMakeLists.txt +++ b/source_modules/hackrf_source/CMakeLists.txt @@ -23,12 +23,12 @@ if (MSVC) target_link_libraries(hackrf_source PRIVATE hackrf) elseif (ANDROID) - target_include_directories(sdrpp_core PUBLIC + target_include_directories(hackrf_source PUBLIC /mnt/android_sdr/libusb/libusb /mnt/android_sdr/hackrf/host/libhackrf/src ) - target_link_libraries(sdrpp_core PUBLIC + target_link_libraries(hackrf_source PUBLIC /mnt/android_sdr/output/libusb/${ANDROID_ABI}/libusb1.0.so /mnt/android_sdr/output/libhackrf/${ANDROID_ABI}/libhackrf.so ) diff --git a/source_modules/plutosdr_source/CMakeLists.txt b/source_modules/plutosdr_source/CMakeLists.txt index bbd8ea40..224a328d 100644 --- a/source_modules/plutosdr_source/CMakeLists.txt +++ b/source_modules/plutosdr_source/CMakeLists.txt @@ -25,12 +25,12 @@ if (MSVC) target_link_libraries(plutosdr_source PRIVATE libiio) target_link_libraries(plutosdr_source PRIVATE libad9361) elseif (ANDROID) - target_include_directories(sdrpp_core PUBLIC + target_include_directories(plutosdr_source PUBLIC /mnt/android_sdr/libiio /mnt/android_sdr/libad9361-iio ) - target_link_libraries(sdrpp_core PUBLIC + target_link_libraries(plutosdr_source PUBLIC /mnt/android_sdr/output/libxml2/${ANDROID_ABI}/libxml2.so /mnt/android_sdr/output/libiio/${ANDROID_ABI}/libiio.so /mnt/android_sdr/output/libad9361/${ANDROID_ABI}/libad9361.so diff --git a/source_modules/rtl_sdr_source/CMakeLists.txt b/source_modules/rtl_sdr_source/CMakeLists.txt index bbd6d950..3df82b21 100644 --- a/source_modules/rtl_sdr_source/CMakeLists.txt +++ b/source_modules/rtl_sdr_source/CMakeLists.txt @@ -23,12 +23,12 @@ if (MSVC) target_link_libraries(rtl_sdr_source PRIVATE rtlsdr) elseif (ANDROID) - target_include_directories(sdrpp_core PUBLIC + target_include_directories(rtl_sdr_source PUBLIC /mnt/android_sdr/libusb/libusb /mnt/android_sdr/librtlsdr/include ) - target_link_libraries(sdrpp_core PUBLIC + target_link_libraries(rtl_sdr_source PUBLIC /mnt/android_sdr/output/libusb/${ANDROID_ABI}/libusb1.0.so /mnt/android_sdr/output/librtlsdr/${ANDROID_ABI}/librtlsdr.so )