From 46a840b66c3ac08a9671aa9de8c2be856f7b3b89 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 13 Jul 2021 17:58:46 +0200 Subject: [PATCH 1/3] CMakeLists.txt Adding DAQ RawLib dependency --- source/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 433ed717d..1cddeecfd 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -64,6 +64,11 @@ if( ${REST_G4} MATCHES ON ) set( RESTLIB_GEANT4 ON ) endif() +if( ${REST_DAQ} MATCHES ON ) + set( RESTLIB_RAW ON ) +endif() + +# Not sure if these lines are really needed. (Javier - 13/Jul/2021) if( ${RESTLIB_DETECTOR} MATCHES ON ) if( ${RESTLIB_RAW} MATCHES ON) set( RESTLIB_CONNECTORS ON ) From cc84f57a2f116ff2bfc5e25187ca98a32b1563ee Mon Sep 17 00:00:00 2001 From: juanan Date: Mon, 30 May 2022 14:16:20 +0200 Subject: [PATCH 2/3] Removing duplicated compilation of rawlib if REST_DAQ is enabled --- source/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index f6e85bca1..3d8a6499d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -68,12 +68,6 @@ if( ${REST_DAQ} MATCHES ON ) set( RESTLIB_RAW ON ) endif() -if( ${REST_DAQ} MATCHES ON ) - if (${RESTLIB_RAW} MATCHES OFF) - set(RESTLIB_RAW ON) - endif () -endif () - if (${RESTLIB_DETECTOR} MATCHES ON) if (${RESTLIB_RAW} MATCHES ON) set(RESTLIB_CONNECTORS ON) From f93353eac34bb9357dfb750384fd0929c999cc7b Mon Sep 17 00:00:00 2001 From: juanan Date: Mon, 30 May 2022 18:03:08 +0200 Subject: [PATCH 3/3] Adding restDAQ as submodule --- .gitmodules | 3 +++ source/packages/restDAQ | 1 + 2 files changed, 4 insertions(+) create mode 160000 source/packages/restDAQ diff --git a/.gitmodules b/.gitmodules index 2079d1c40..486e42ed4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,3 +67,6 @@ [submodule "projects/alphacamm"] path = projects/alphacamm url = git@lfna.unizar.es:gifna/alphacamm.git +[submodule "source/packages/restDAQ"] + path = source/packages/restDAQ + url = https://github.com/rest-for-physics/restDAQ.git diff --git a/source/packages/restDAQ b/source/packages/restDAQ new file mode 160000 index 000000000..c5909711c --- /dev/null +++ b/source/packages/restDAQ @@ -0,0 +1 @@ +Subproject commit c5909711c52efe9d9a2ad615594f82c8f43f0aa3