fix: RCDB inclusion and linking

JeffersonLab · Jan 29, 2025 · 861f037 · 861f037
1 parent a47415f
commit 861f037
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/meson.build b/meson.build
@@ -174,7 +174,7 @@ endif
 # general project vars
 project_inc       = include_directories('src')
 project_libs      = []
-project_deps      = declare_dependency(dependencies: [ fmt_dep, yamlcpp_dep, hipo_dep ] ) # do NOT include ROOT here
+project_deps      = declare_dependency(dependencies: dep_list) # do NOT include ROOT here
 project_etc       = get_option('sysconfdir') / meson.project_name()
 project_data      = get_option('datadir') / meson.project_name()
 project_test_env  = environment()

diff --git a/src/iguana/algorithms/meson.build b/src/iguana/algorithms/meson.build
@@ -214,7 +214,7 @@ algo_lib = shared_library(
   install: true,
   build_rpath: ROOT_dep_rpath,
 )
-
+install_headers(algo_headers, subdir: meson.project_name() / 'algorithms', preserve_path: true)
 foreach algo_datum : algo_data
   install_data(
     algo_data,

diff --git a/src/iguana/services/meson.build b/src/iguana/services/meson.build
@@ -1,11 +1,10 @@
-services_sources = [ 'Logger.cc', 'Object.cc', 'ConfigFileReader.cc', 'YAMLReader.cc', 'ConcurrentParam.cc', 'GlobalParam.cc', 'DataFileReader.cc']
-services_headers = [ 'Logger.h', 'Object.h', 'ConfigFileReader.h', 'YAMLReader.h', 'ConcurrentParam.h', 'GlobalParam.h', 'DataFileReader.h' ]
+services_sources = [ 'Logger.cc', 'Object.cc', 'ConfigFileReader.cc', 'YAMLReader.cc', 'ConcurrentParam.cc', 'GlobalParam.cc', 'RCDBReader.cc', 'DataFileReader.cc' ]
+services_headers = [ 'Logger.h', 'Object.h', 'ConfigFileReader.h', 'YAMLReader.h', 'ConcurrentParam.h', 'GlobalParam.h', 'RCDBReader.h', 'DataFileReader.h' ]
 
 if rcdb_dep.found()
   add_project_arguments('-DUSE_RCDB', language: ['cpp'])
 endif
 
-
 services_lib = shared_library(
   'IguanaServices',
   services_sources,

diff --git a/src/iguana/tests/meson.build b/src/iguana/tests/meson.build
@@ -45,7 +45,7 @@ foreach algo : algo_dict
         suite: [ 'algorithm', 'single_threaded' ],
         args: [ 'algorithm', '-n', get_option('test_num_events') ] + test_args,
         env: project_test_env,
-        timeout: 120,
+        timeout: 0,
       )
       benchmark(
         '-'.join(['benchmark', 'single_threaded', test_name_algo]),