VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-17 13:51:47 -05:00
Code Issues Projects Releases Wiki Activity

Build: fixed Linux build with external libraries

Browse Source
This commit is contained in:
f4exb 2019-06-25 01:16:04 +02:00
parent 4e1bee09e3
commit a9db3c2381
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/soapysdr/CMakeLists.txt
View File

@ -30,7 +30,7 @@ target_link_libraries(soapysdrdevice
sdrbase sdrbase
) )
if(ENABLE_EXTERNAL_LIBRARIES) if(ENABLE_EXTERNAL_LIBRARIES AND NOT LINUX)
add_dependencies(soapysdrdevice soapysdr) add_dependencies(soapysdrdevice soapysdr)
endif() endif()

2
external/CMakeLists.txt vendored
View File

@ -211,7 +211,7 @@ if(WIN32 OR LINUX)
makeCopyDir("${source_dir}" "${source_dir}/dsp" serialdv) makeCopyDir("${source_dir}" "${source_dir}/dsp" serialdv)
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/serialdv${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}") install(FILES "${SDRANGEL_BINARY_BIN_DIR}/serialdv${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
elseif(LINUX) elseif(LINUX)
set(LIBSERIALDV_LIBRARY "${binary_dir}/libserialdv${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") set(LIBSERIALDV_LIBRARY "${EXTERNAL_BUILD_LIBRARIES}/lib/libserialdv${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
# because sdrbase/dsp/dvserialworker.h use dsp/dvcontroller.h # because sdrbase/dsp/dvserialworker.h use dsp/dvcontroller.h
# so we need a link # so we need a link
makeLink("${source_dir}" "${source_dir}/dsp" serialdv) makeLink("${source_dir}" "${source_dir}/dsp" serialdv)