diff --git a/CMakeLists.txt b/CMakeLists.txt index 7baafba8f..c6dde2565 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,6 +224,7 @@ elseif (WIN32) set(LIBUSB_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/libusb/MS64/dll/libusb-1.0.lib" CACHE INTERNAL "") set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv" CACHE INTERNAL "") set(PKG_CONFIG_EXECUTABLE "${EXTERNAL_LIBRARY_FOLDER}/pkg-config-lite/bin/pkg-config.exe" CACHE INTERNAL "") + set(SOAPYSUPPORT_DIR "${EXTERNAL_LIBRARY_FOLDER}/soapysdr-support" CACHE INTERNAL "") set(CODEC2_FOUND ON CACHE INTERNAL "") set(CODEC2_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/codec2/include" CACHE INTERNAL "") diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt index 5611cda4f..f3f148220 100644 --- a/cmake/cpack/CMakeLists.txt +++ b/cmake/cpack/CMakeLists.txt @@ -211,6 +211,26 @@ elseif(WIN32 OR MINGW) ) endforeach(opencv_dll) + if(ENABLE_SOAPYSDR AND SOAPYSDR_FOUND) + # Soapy support libraries + file(GLOB SOAPYSUPPORT_DLLS "${SOAPYSUPPORT_DIR}/bin/*${CMAKE_SHARED_LIBRARY_SUFFIX}") + foreach(soapysupport_dll ${SOAPYSUPPORT_DLLS}) + get_filename_component(soapysupport_dll_name "${soapysupport_dll}" NAME) + add_custom_target(copy_soapysupport_${soapysupport_dll_name} ALL + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${soapysupport_dll}" "${SDRANGEL_BINARY_BIN_DIR}/" + ) + endforeach(soapysupport_dll) + file(MAKE_DIRECTORY ${SDRANGEL_BINARY_LIB_DIR}/SoapySDR) + file(MAKE_DIRECTORY ${SDRANGEL_BINARY_LIB_DIR}/SoapySDR/modules0.7) + file(GLOB SOAPYSUPPORT_DLLS "${SOAPYSUPPORT_DIR}/lib/SoapySDR/modules0.7/*${CMAKE_SHARED_LIBRARY_SUFFIX}") + foreach(soapysupport_dll ${SOAPYSUPPORT_DLLS}) + get_filename_component(soapysupport_dll_name "${soapysupport_dll}" NAME) + add_custom_target(copy_soapysupport_${soapysupport_dll_name} ALL + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${soapysupport_dll}" "${SDRANGEL_BINARY_LIB_DIR}/SoapySDR/modules0.7/" + ) + endforeach(soapysupport_dll) + endif() + file(GLOB CODEC2_DLLS "${CODEC2_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}") foreach(codec2_dll ${CODEC2_DLLS}) get_filename_component(codec2_dll_name "${codec2_dll}" NAME)