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/other_tools/utils/TARGETS              | 21 +++++++++++++--------
 src/other_tools/utils/curl_context.cpp     |  1 +
 src/other_tools/utils/curl_easy_handle.cpp |  2 ++
 src/other_tools/utils/curl_easy_handle.hpp |  1 -
 src/other_tools/utils/curl_url_handle.cpp  |  1 +
 5 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'src/other_tools/utils')

diff --git a/src/other_tools/utils/TARGETS b/src/other_tools/utils/TARGETS
index 207dfb76..e210f901 100644
--- a/src/other_tools/utils/TARGETS
+++ b/src/other_tools/utils/TARGETS
@@ -4,21 +4,22 @@
   , "hdrs": ["curl_context.hpp"]
   , "srcs": ["curl_context.cpp"]
   , "stage": ["src", "other_tools", "utils"]
-  , "private-deps": [["src/buildtool/logging", "logging"], ["", "libcurl"]]
+  , "private-deps":
+    [ ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
+    , ["", "libcurl"]
+    ]
   }
 , "curl_easy_handle":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["curl_easy_handle"]
   , "hdrs": ["curl_easy_handle.hpp"]
   , "srcs": ["curl_easy_handle.cpp"]
-  , "deps":
-    [ "curl_context"
-    , ["src/buildtool/logging", "log_level"]
-    , ["@", "gsl", "", "gsl"]
-    ]
+  , "deps": ["curl_context", ["src/buildtool/logging", "log_level"]]
   , "stage": ["src", "other_tools", "utils"]
   , "private-deps":
-    [ ["src/buildtool/file_system", "file_system_manager"]
+    [ ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/logging", "logging"]
     , ["", "libcurl"]
     ]
@@ -30,7 +31,11 @@
   , "srcs": ["curl_url_handle.cpp"]
   , "deps": ["curl_context", ["@", "gsl", "", "gsl"]]
   , "stage": ["src", "other_tools", "utils"]
-  , "private-deps": [["src/buildtool/logging", "logging"], ["", "libcurl"]]
+  , "private-deps":
+    [ ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
+    , ["", "libcurl"]
+    ]
   }
 , "content":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/src/other_tools/utils/curl_context.cpp b/src/other_tools/utils/curl_context.cpp
index 46f7cfac..44d8048d 100644
--- a/src/other_tools/utils/curl_context.cpp
+++ b/src/other_tools/utils/curl_context.cpp
@@ -14,6 +14,7 @@
 
 #include "src/other_tools/utils/curl_context.hpp"
 
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
 extern "C" {
diff --git a/src/other_tools/utils/curl_easy_handle.cpp b/src/other_tools/utils/curl_easy_handle.cpp
index cf833be9..6939c6d1 100644
--- a/src/other_tools/utils/curl_easy_handle.cpp
+++ b/src/other_tools/utils/curl_easy_handle.cpp
@@ -17,7 +17,9 @@
 #include <cstdio>
 #include <fstream>
 
+#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"
 
 extern "C" {
diff --git a/src/other_tools/utils/curl_easy_handle.hpp b/src/other_tools/utils/curl_easy_handle.hpp
index 4c03d968..1a3d31c3 100644
--- a/src/other_tools/utils/curl_easy_handle.hpp
+++ b/src/other_tools/utils/curl_easy_handle.hpp
@@ -21,7 +21,6 @@
 #include <optional>
 #include <string>
 
-#include "gsl/gsl"
 #include "src/buildtool/logging/log_level.hpp"
 #include "src/other_tools/utils/curl_context.hpp"
 
diff --git a/src/other_tools/utils/curl_url_handle.cpp b/src/other_tools/utils/curl_url_handle.cpp
index 27898299..912691b4 100644
--- a/src/other_tools/utils/curl_url_handle.cpp
+++ b/src/other_tools/utils/curl_url_handle.cpp
@@ -17,6 +17,7 @@
 #include <regex>
 #include <sstream>
 
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
 extern "C" {
-- 
cgit v1.2.3