VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #687 from kasper93/soapysdr 

Package SoapySDR modules
This commit is contained in:
Edouard Griffiths 2020-11-07 02:13:33 +01:00 committed by GitHub
parent 556ddaaff6 88ef866edb
commit eea8828943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
external/CMakeLists.txt vendored
View File

@ -602,6 +602,7 @@ if (WIN32 OR APPLE)
set(SOAPYSDR_INCLUDE_DIR "${source_dir}/include" CACHE INTERNAL "")
if (WIN32)
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/SoapySDR${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
install(DIRECTORY "${SDRANGEL_BINARY_LIB_DIR}/SoapySDR" DESTINATION "${INSTALL_LIB_DIR}/lib")
elseif (APPLE)
set(SOAPYSDR_LIBRARY "${binary_dir}/lib/libSoapySDR${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
install(DIRECTORY "${binary_dir}/lib/" DESTINATION "${INSTALL_LIB_DIR}"

4
sdrbase/plugin/pluginmanager.cpp
View File

@ -76,6 +76,10 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
PluginsPath << applicationDirPath + "/../Resources/lib/" + pluginsSubDir;
#elif defined(_WIN32) || defined(WIN32)
PluginsPath << applicationDirPath + "/" + pluginsSubDir;
// Give SoapySDR hint about modules location.
// By default it searches in `$applicationDir/../lib/SoapySDR/`, which on Windows
// is incorrect as both `bin` and `lib` dir are set to root application dir.
qputenv("SOAPY_SDR_ROOT", applicationDirPath.toLocal8Bit());
#endif
// NOTE: exit on the first folder found