ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Modified directory structure to have al uldaq-files in the subfolder uldaq
All checks were successful
Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Successful in -3m43s
Details
Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been skipped
Details

Browse Source
This commit is contained in:
Anne de Jong 2024-09-26 11:31:32 +02:00
parent 509f165ecb
commit a38eca47f3
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpp_src/device/CMakeLists.txt
View File

@ -2,7 +2,7 @@
include_directories(uldaq) include_directories(uldaq)
include_directories(portaudio) include_directories(portaudio)
add_library(lasp_device_lib OBJECT add_library(lasp_device_lib OBJECT
lasp_daq.cpp lasp_daq.cpp
lasp_daqconfig.cpp lasp_daqconfig.cpp
lasp_daqdata.cpp lasp_daqdata.cpp
@ -10,12 +10,8 @@ add_library(lasp_device_lib OBJECT
lasp_rtaudiodaq.cpp lasp_rtaudiodaq.cpp
lasp_streammgr.cpp lasp_streammgr.cpp
lasp_indatahandler.cpp lasp_indatahandler.cpp
lasp_uldaq.cpp
uldaq/lasp_uldaq_impl.cpp
uldaq/lasp_uldaq_bufhandler.cpp
uldaq/lasp_uldaq_common.cpp
portaudio/lasp_portaudiodaq.cpp portaudio/lasp_portaudiodaq.cpp
) )
# Callback requires certain arguments that are not used by code. This disables # Callback requires certain arguments that are not used by code. This disables
# a compiler warning about it. # a compiler warning about it.
@ -28,7 +24,9 @@ target_include_directories(lasp_device_lib INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}) ${CMAKE_CURRENT_SOURCE_DIR})
if(LASP_HAS_ULDAQ) if(LASP_HAS_ULDAQ)
target_link_libraries(lasp_device_lib uldaq) add_subdirectory(uldaq)
target_include_directories(lasp_device_lib INTERFACE uldaq)
target_link_libraries(lasp_device_lib uldaq_backend uldaq)
endif() endif()
if(LASP_HAS_RTAUDIO) if(LASP_HAS_RTAUDIO)
target_link_libraries(lasp_device_lib rtaudio) target_link_libraries(lasp_device_lib rtaudio)

6
cpp_src/device/uldaq/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
add_library(uldaq_backend lasp_uldaq.cpp lasp_uldaq_bufhandler.cpp lasp_uldaq_common.cpp lasp_uldaq_impl.cpp)
target_include_directories(uldaq_backend PUBLIC ../)
target_include_directories(uldaq_backend PUBLIC ../../)
target_include_directories(uldaq_backend PUBLIC ../../dsp)
target_include_directories(uldaq_backend INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

0
cpp_src/device/lasp_uldaq.cpp → cpp_src/device/uldaq/lasp_uldaq.cpp
View File

0
cpp_src/device/lasp_uldaq.h → cpp_src/device/uldaq/lasp_uldaq.h
View File

6
cpp_src/device/uldaq/lasp_uldaq_common.cpp
View File

@ -3,8 +3,8 @@
#include "lasp_config.h" #include "lasp_config.h"
#if LASP_HAS_ULDAQ == 1 #if LASP_HAS_ULDAQ == 1
#include "lasp_uldaq_common.h"
#include "lasp_daq.h" #include "lasp_daq.h"
#include "lasp_uldaq_common.h"
string getErrMsg(UlError err) { string getErrMsg(UlError err) {
string errstr; string errstr;
@ -21,11 +21,9 @@ void showErr(string errstr) {
std::cerr << "***********************************************\n\n"; std::cerr << "***********************************************\n\n";
} }
void showErr(UlError err) { void showErr(UlError err) {
if (err != ERR_NO_ERROR) if (err != ERR_NO_ERROR) showErr(getErrMsg(err));
showErr(getErrMsg(err));
} }
void throwOnPossibleUlException(UlError err) { void throwOnPossibleUlException(UlError err) {
if (err == ERR_NO_ERROR) { if (err == ERR_NO_ERROR) {
return; return;