From d0f2ba0ab15e63aa3511218a837eb6f057632ace Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Thu, 14 Mar 2024 16:21:55 +0100
Subject: Clean up more includes and targets

Some of the more specific issues addressed:
- missing log_level target/include
- header-only libs wrongly marking deps as private
- missing/misplaced gsl includes
---
 src/utils/cpp/TARGETS          | 9 +++++++--
 src/utils/cpp/file_locking.cpp | 2 ++
 src/utils/cpp/tmp_dir.cpp      | 3 ++-
 src/utils/cpp/tmp_dir.hpp      | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/utils/cpp')

diff --git a/src/utils/cpp/TARGETS b/src/utils/cpp/TARGETS
index 578996b2..dbc409a6 100644
--- a/src/utils/cpp/TARGETS
+++ b/src/utils/cpp/TARGETS
@@ -59,9 +59,12 @@
   , "name": ["tmp_dir"]
   , "hdrs": ["tmp_dir.hpp"]
   , "srcs": ["tmp_dir.cpp"]
-  , "deps": [["@", "gsl", "", "gsl"]]
   , "stage": ["src", "utils", "cpp"]
-  , "private-deps": [["src/buildtool/file_system", "file_system_manager"]]
+  , "private-deps":
+    [ ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
+    ]
   }
 , "file_locking":
   { "type": ["@", "rules", "CC", "library"]
@@ -72,6 +75,8 @@
   , "stage": ["src", "utils", "cpp"]
   , "private-deps":
     [ ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "path"]
     ]
   }
diff --git a/src/utils/cpp/file_locking.cpp b/src/utils/cpp/file_locking.cpp
index c633b32b..f4b6eb2c 100644
--- a/src/utils/cpp/file_locking.cpp
+++ b/src/utils/cpp/file_locking.cpp
@@ -17,6 +17,8 @@
 #include <sys/file.h>
 
 #include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
 #include "src/utils/cpp/path.hpp"
 
 auto LockFile::Acquire(std::filesystem::path const& fspath,
diff --git a/src/utils/cpp/tmp_dir.cpp b/src/utils/cpp/tmp_dir.cpp
index 987bcbcf..11f10559 100644
--- a/src/utils/cpp/tmp_dir.cpp
+++ b/src/utils/cpp/tmp_dir.cpp
@@ -14,8 +14,9 @@
 
 #include "src/utils/cpp/tmp_dir.hpp"
 
-#include "gsl/gsl"
 #include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
 
 auto TmpDir::Create(std::filesystem::path const& prefix,
                     std::string const& dir_template) noexcept -> TmpDirPtr {
diff --git a/src/utils/cpp/tmp_dir.hpp b/src/utils/cpp/tmp_dir.hpp
index 3801e7a0..9188fa60 100644
--- a/src/utils/cpp/tmp_dir.hpp
+++ b/src/utils/cpp/tmp_dir.hpp
@@ -17,6 +17,7 @@
 
 #include <cstdlib>
 #include <filesystem>
+#include <memory>
 #include <optional>
 #include <string>
 
-- 
cgit v1.2.3