gps preamplifier definitions #2

Open
soederqvist_a wants to merge 2 commits from gps-preamplifier into main
pull from: gps-preamplifier
+14 -25
View File
@@ -11,12 +11,6 @@ add_compile_options(
-Wno-unused-function
)
option(
BUILD_FRONTEND
"If ON, build the default frontend executable"
OFF
)
set(CMAKE_PREFIX_PATH "$ENV{MIDASSYS}")
find_package(Midas REQUIRED)
@@ -32,27 +26,11 @@ set(
$ENV{MIDASSYS}/drivers/class/generic.cxx
)
set(SYS_LIBS
pthread
util
rt
dl
)
#build midas_lan_gib if not already there
if(NOT TARGET midas_lan_gpib)
add_subdirectory(midas_lan_gpib)
if(NOT TARGET midas_lan_gpib)
add_subdirectory(midas_lan_gpib)
endif()
# Links to libmfe.a and libmidas.a
set(MIDAS_LIBS
midas::mfe
midas::midas
midas_lan_gpib
)
set(LIBS ${SYS_LIBS} ${MIDAS_LIBS})
################################################################################
## make tcpip library configurable
################################################################################
@@ -72,7 +50,12 @@ add_library(
# Compile the device driver for use with GPIB
target_compile_definitions(agilent_e364xa PRIVATE LANGPIB_SUPPORT)
target_compile_definitions(agilent_e364xa PRIVATE GPIB_SUPPORT)
target_compile_definitions(agilent_e364xa PRIVATE LANGPIB_RECONNECT)
target_compile_definitions(agilent_e364xa PRIVATE VOLTAMPERE_SUPPORT)
target_compile_definitions(agilent_e364xa PRIVATE E364XA_OUTPUT_CHAN)
#target_compile_definitions(agilent_e364xa PRIVATE MIDEBUGC)
set_property(
@@ -90,7 +73,13 @@ target_include_directories(
target_link_libraries(
agilent_e364xa
${LIBS}
pthread
util
rt
dl
midas::mfe
midas::midas
midas_lan_gpib
)
################################################################################