From f96872546902cd3e48b74beff65f744b29ac439c Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 15:25:28 +0200 Subject: [PATCH] Fixed cmake 3.10 compatibility for ubuntu bionic based distros --- airspy_source/CMakeLists.txt | 1 - airspyhf_source/CMakeLists.txt | 1 - audio_sink/CMakeLists.txt | 2 -- core/CMakeLists.txt | 7 ------- hackrf_source/CMakeLists.txt | 1 - plutosdr_source/CMakeLists.txt | 2 -- rtl_sdr_source/CMakeLists.txt | 1 - soapy_source/CMakeLists.txt | 1 - 8 files changed, 16 deletions(-) diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt index bfc0daa2..197fd646 100644 --- a/airspy_source/CMakeLists.txt +++ b/airspy_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBAIRSPY REQUIRED libairspy) target_include_directories(airspy_source PUBLIC ${LIBAIRSPY_INCLUDE_DIRS}) - target_link_directories(airspy_source PUBLIC ${LIBAIRSPY_LIBRARY_DIRS}) target_link_libraries(airspy_source PUBLIC ${LIBAIRSPY_LIBRARIES}) endif () diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt index 80a23d31..14b525d6 100644 --- a/airspyhf_source/CMakeLists.txt +++ b/airspyhf_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBAIRSPYHF REQUIRED libairspyhf) target_include_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_INCLUDE_DIRS}) - target_link_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARY_DIRS}) target_link_libraries(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARIES}) endif () diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt index 96b02770..4e67b199 100644 --- a/audio_sink/CMakeLists.txt +++ b/audio_sink/CMakeLists.txt @@ -32,8 +32,6 @@ else (MSVC) target_include_directories(audio_sink PUBLIC ${RTAUDIO_INCLUDE_DIRS}) - target_link_directories(audio_sink PUBLIC ${RTAUDIO_LIBRARY_DIRS}) - target_link_libraries(audio_sink PUBLIC ${RTAUDIO_LIBRARIES}) endif () diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index d75a04f5..f0f16aa5 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -64,13 +64,6 @@ else() ${VOLK_INCLUDE_DIRS} ) - target_link_directories(sdrpp_core PUBLIC - ${GLEW_LIBRARY_DIRS} - ${FFTW3_LIBRARY_DIRS} - ${GLFW3_LIBRARY_DIRS} - ${VOLK_LIBRARY_DIRS} - ) - target_link_libraries(sdrpp_core PUBLIC ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt index d4863417..cd7ced2e 100644 --- a/hackrf_source/CMakeLists.txt +++ b/hackrf_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBHACKRF REQUIRED libhackrf) target_include_directories(hackrf_source PUBLIC ${LIBHACKRF_INCLUDE_DIRS}) - target_link_directories(hackrf_source PUBLIC ${LIBHACKRF_LIBRARY_DIRS}) target_link_libraries(hackrf_source PUBLIC ${LIBHACKRF_LIBRARIES}) endif () diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt index 3c5a8964..0ba6f688 100644 --- a/plutosdr_source/CMakeLists.txt +++ b/plutosdr_source/CMakeLists.txt @@ -31,11 +31,9 @@ else (MSVC) pkg_check_modules(LIBAD9361 REQUIRED libad9361) target_include_directories(plutosdr_source PUBLIC ${LIBIIO_INCLUDE_DIRS}) - target_link_directories(plutosdr_source PUBLIC ${LIBIIO_LIBRARY_DIRS}) target_link_libraries(plutosdr_source PUBLIC ${LIBIIO_LIBRARIES}) target_include_directories(plutosdr_source PUBLIC ${LIBAD9361_INCLUDE_DIRS}) - target_link_directories(plutosdr_source PUBLIC ${LIBAD9361_LIBRARY_DIRS}) target_link_libraries(plutosdr_source PUBLIC ${LIBAD9361_LIBRARIES}) endif () diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt index 939ceefa..d6e40f7f 100644 --- a/rtl_sdr_source/CMakeLists.txt +++ b/rtl_sdr_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBRTLSDR REQUIRED librtlsdr) target_include_directories(rtl_sdr_source PUBLIC ${LIBRTLSDR_INCLUDE_DIRS}) - target_link_directories(rtl_sdr_source PUBLIC ${LIBRTLSDR_LIBRARY_DIRS}) target_link_libraries(rtl_sdr_source PUBLIC ${LIBRTLSDR_LIBRARIES}) endif () diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt index 34eb8b29..2d25b0f8 100644 --- a/soapy_source/CMakeLists.txt +++ b/soapy_source/CMakeLists.txt @@ -29,7 +29,6 @@ else (MSVC) pkg_check_modules(SOAPY REQUIRED SoapySDR) target_include_directories(soapy_source PUBLIC ${SOAPY_INCLUDE_DIRS}) - target_link_directories(soapy_source PUBLIC ${SOAPY_LIBRARY_DIRS}) target_link_libraries(soapy_source PUBLIC ${SOAPY_LIBRARIES}) endif ()