From 23e0325c46842f2ea0751047b4e22183bc6d3c3e Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Thu, 20 Mar 2025 15:18:54 +0100
Subject: [PATCH] make the CbmYamlInterface library use the same include with
path convention as the rest of the code
---
algo/base/yaml/CMakeLists.txt | 8 ++++----
algo/base/yaml/Yaml.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/algo/base/yaml/CMakeLists.txt b/algo/base/yaml/CMakeLists.txt
index f943052cf1..756401d832 100644
--- a/algo/base/yaml/CMakeLists.txt
+++ b/algo/base/yaml/CMakeLists.txt
@@ -1,5 +1,5 @@
set(INCLUDE_DIRECTORIES
- ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/algo/base # For "algo/base/yaml/*.h" included as relative "yaml/?????.h" to fit install tree
)
add_library(CbmYamlInterface INTERFACE)
@@ -10,13 +10,13 @@ target_include_directories(CbmYamlInterface
target_link_libraries(CbmYamlInterface
INTERFACE GSL
- xpu
- fmt::fmt
+ xpu
+ fmt::fmt
external::yaml-cpp
)
install(
- FILES
+ FILES
BaseTypes.h
Property.h
Yaml.h
diff --git a/algo/base/yaml/Yaml.h b/algo/base/yaml/Yaml.h
index 8745bd1416..56bd2246e0 100644
--- a/algo/base/yaml/Yaml.h
+++ b/algo/base/yaml/Yaml.h
@@ -3,11 +3,11 @@
Authors: Felix Weiglhofer [committer] */
#pragma once
-#include "BaseTypes.h"
#include "Definitions.h"
-#include "Property.h"
#include "compat/Filesystem.h"
#include "util/EnumDict.h"
+#include "yaml/BaseTypes.h"
+#include "yaml/Property.h"
#include <sstream>
#include <string_view>
--
GitLab