From 8d03b80865085b722d5416b25b97a0cf74056bef Mon Sep 17 00:00:00 2001 From: Alexander Soederqvist Date: Tue, 27 Oct 2026 16:32:18 +0100 Subject: [PATCH 1/2] gps preamplifier definitions --- CMakeLists.txt | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa51d99..389bef0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,27 +32,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 +56,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 +79,13 @@ target_include_directories( target_link_libraries( agilent_e364xa - ${LIBS} + pthread + util + rt + dl + midas::mfe + midas::midas + midas_lan_gpib ) ################################################################################ -- 2.54.1 From ff70e39eecae1a6983bdb7e176f1838c1c7a94f9 Mon Sep 17 00:00:00 2001 From: Alexander Soederqvist Date: Wed, 28 Oct 2026 13:06:55 +0100 Subject: [PATCH 2/2] Remove old BUILD_FRONTEND macro --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 389bef0..eb86c9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- 2.54.1