From fa2ef5974d5ae2da84d04808791a764545995bfe Mon Sep 17 00:00:00 2001
From: Edward Wall <edward.wall@psi.ch>
Date: Thu, 16 Jul 2026 14:11:54 +0200
Subject: [PATCH] corrects CMakeLists file

---
 CMakeLists.txt | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3133767..6a4144c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,12 +20,20 @@ option(
 set(CMAKE_PREFIX_PATH "$ENV{MIDASSYS}")
 find_package(Midas REQUIRED)
 
-set(
-  DRIVERS
-  $ENV{MIDASSYS}/drivers/bus/null.cxx
-  $ENV{MIDASSYS}/drivers/class/generic.cxx
+set(SYS_LIBS
+    pthread
+    util
+    rt
+    dl
 )
 
+set(MIDAS_LIBS
+    midas::midas
+    midas::mscb
+)
+
+set(LIBS ${SYS_LIBS} ${MIDAS_LIBS})
+
 ################################################################################
 ## Device Library
 ################################################################################
@@ -33,7 +41,8 @@ set(
 add_library(
   cfd950
   device/cfd950.cxx
-  ${DRIVERS}
+  $ENV{MIDASSYS}/drivers/bus/null.cxx
+  $ENV{MIDASSYS}/drivers/class/generic.cxx
 )
 
 set_property(
@@ -46,19 +55,12 @@ set_property(
 target_include_directories(
   cfd950
   PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/device>
-    $<INSTALL_INTERFACE:include>
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(
   cfd950
-  PUBLIC
-    pthread
-    util
-    rt
-    dl
-    midas::midas
-    midas::mscb
+  ${LIBS}
 )
 
 ################################################################################