From ab2d9270ac41f12bba68fc8496e422a946f4beb9 Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Tue, 21 May 2019 20:40:16 +0200 Subject: [PATCH] libxtrx: fix LIBXTRX_LIBRARY variable --- cmake/Modules/FindLibXTRX.cmake | 4 +--- devices/xtrx/CMakeLists.txt | 2 +- plugins/samplesource/xtrxinput/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/Modules/FindLibXTRX.cmake b/cmake/Modules/FindLibXTRX.cmake index 4768326ba..d13634898 100644 --- a/cmake/Modules/FindLibXTRX.cmake +++ b/cmake/Modules/FindLibXTRX.cmake @@ -28,9 +28,7 @@ if(NOT LIBXTRX_FOUND) set(LIBXTRX_FOUND FALSE CACHE INTERNAL "libxtrx found") message(STATUS "libxtrx not found.") endif() - - - mark_as_advanced(LIBXTRX_INCLUDE_DIRS) + mark_as_advanced(LIBXTRX_INCLUDE_DIRS LIBXTRX_LIBRARY) endif(NOT LIBXTRX_FOUND) \ No newline at end of file diff --git a/devices/xtrx/CMakeLists.txt b/devices/xtrx/CMakeLists.txt index d6263911d..0be128737 100644 --- a/devices/xtrx/CMakeLists.txt +++ b/devices/xtrx/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(xtrxdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS") target_link_libraries(xtrxdevice - ${LIBXTRX_LIBRARIES} + ${LIBXTRX_LIBRARY} sdrbase ) diff --git a/plugins/samplesource/xtrxinput/CMakeLists.txt b/plugins/samplesource/xtrxinput/CMakeLists.txt index e7d57a51d..6fd7a8efe 100644 --- a/plugins/samplesource/xtrxinput/CMakeLists.txt +++ b/plugins/samplesource/xtrxinput/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(${TARGET_NAME} sdrbase ${TARGET_LIB_GUI} swagger - ${LIBXTRX_LIBRARIES} + ${LIBXTRX_LIBRARY} xtrxdevice )