From feb0e0362a856acff7dfdd149a7a65919d81e26a Mon Sep 17 00:00:00 2001
From: smathis <stefan.mathis@psi.ch>
Date: Thu, 6 Nov 2025 11:43:52 +0100
Subject: [PATCH] Made installation more robust - MIDASSYS does not need to be
 the MIDAS repo anymore

---
 CMakeLists.txt | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f209226..c335715 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,20 +21,25 @@ set(
   DRIVERS
   $ENV{MIDASSYS}/drivers/bus/null.cxx
   $ENV{MIDASSYS}/drivers/class/generic.cxx
-  $ENV{MIDASSYS}/mscb/src/mscb.cxx
 )
 
-set(
-  LIBS
-  # -lz          # compression library
-  -lpthread
-  -lutil
-  -lrt         # librt for real time guarantees (really just backwards compat)
-  -ldl         # libdl for dynamic loading
-  $ENV{MIDASSYS}/lib/libmfe.a
-  $ENV{MIDASSYS}/lib/libmidas.a
+set(SYS_LIBS
+    pthread
+    util
+    rt
+    dl
 )
 
+link_directories($ENV{MIDASSYS}/lib)
+# Links to libmfe.a, libmidas.a and libmscb.a
+set(MIDAS_LIBS
+    mfe
+    midas
+    mscb
+)
+
+set(LIBS ${SYS_LIBS} ${MIDAS_LIBS})
+
 ################################################################################
 ## Device Library
 ################################################################################