VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

MacOS compatibility with serialDV

Browse Source
This commit is contained in:
f4exb 2019-10-12 05:39:41 +02:00
parent 73d3355914
commit 9a849a9bbb
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
external/CMakeLists.txt vendored
View File

@ -209,37 +209,36 @@ elseif(APPLE)
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
endif() endif()
if(WIN32 OR LINUX) # Works on MacOS with a dummy serialDV
ExternalProject_Add(serialdv ExternalProject_Add(serialdv
GIT_REPOSITORY https://github.com/f4exb/serialDV.git GIT_REPOSITORY https://github.com/f4exb/serialDV.git
GIT_TAG ${SERIALDV_TAG} GIT_TAG ${SERIALDV_TAG}
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/serialdv" PREFIX "${EXTERNAL_BUILD_LIBRARIES}/serialdv"
CMAKE_ARGS -DBUILD_TOOL=OFF ${DEFAULT_OUTPUT_DIRECTORIES} CMAKE_ARGS -DBUILD_TOOL=OFF ${DEFAULT_OUTPUT_DIRECTORIES}
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
) )
ExternalProject_Get_Property(serialdv source_dir binary_dir) ExternalProject_Get_Property(serialdv source_dir binary_dir)
set(DSDCC_DEPENDS ${DSDCC_DEPENDS} serialdv) set(DSDCC_DEPENDS ${DSDCC_DEPENDS} serialdv)
set(LIBSERIALDV_FOUND ON CACHE INTERNAL "") set(LIBSERIALDV_FOUND ON CACHE INTERNAL "")
set(LIBSERIALDV_INCLUDE_DIR "${source_dir}" CACHE INTERNAL "") set(LIBSERIALDV_INCLUDE_DIR "${source_dir}" CACHE INTERNAL "")
if(WIN32) if(WIN32)
set(LIBSERIALDV_LIBRARY "${SDRANGEL_BINARY_LIB_DIR}/serialdv.lib" CACHE INTERNAL "") set(LIBSERIALDV_LIBRARY "${SDRANGEL_BINARY_LIB_DIR}/serialdv.lib" CACHE INTERNAL "")
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 "${EXTERNAL_BUILD_LIBRARIES}/lib/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)
elseif(APPLE) elseif(APPLE)
set(LIBSERIALDV_LIBRARY "${binary_dir}/libserialdv${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") set(LIBSERIALDV_LIBRARY "${binary_dir}/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)
install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}" install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "libserialdv*${CMAKE_SHARED_LIBRARY_SUFFIX}") FILES_MATCHING PATTERN "libserialdv*${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
endif()
endif() endif()
ExternalProject_Add(dsdcc ExternalProject_Add(dsdcc

2
sdrgui/mainwindow.cpp
View File

@ -1671,8 +1671,10 @@ void MainWindow::on_action_DeviceUserArguments_triggered()
void MainWindow::on_action_AMBE_triggered() void MainWindow::on_action_AMBE_triggered()
{ {
qDebug("MainWindow::on_action_AMBE_triggered"); qDebug("MainWindow::on_action_AMBE_triggered");
#ifndef __APPLE__
AMBEDevicesDialog ambeDevicesDialog(m_dspEngine->getAMBEEngine(), this); AMBEDevicesDialog ambeDevicesDialog(m_dspEngine->getAMBEEngine(), this);
ambeDevicesDialog.exec(); ambeDevicesDialog.exec();
#endif
} }
void MainWindow::sampleSourceChanged() void MainWindow::sampleSourceChanged()