From b18bd79d3766ce3aa9bec94bfb8b26bd556b4d16 Mon Sep 17 00:00:00 2001
From: Benjamin Morgan <benjamin.morgan@bosch.com>
Date: Fri, 12 Jul 2024 11:37:21 +0200
Subject: [PATCH] fixup! tooling: Add Bazel support

---
 oak/BUILD.bazel                  | 6 ------
 oak/src/oak/registrar.cpp        | 7 ++++---
 oak/src/oak/route_muxer_test.cpp | 2 +-
 oak/src/oak/server.cpp           | 5 +++--
 oak/src/oak/server_test.cpp      | 7 ++++---
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/oak/BUILD.bazel b/oak/BUILD.bazel
index 57df0df0f..5f19730a0 100644
--- a/oak/BUILD.bazel
+++ b/oak/BUILD.bazel
@@ -3,9 +3,6 @@ cc_library(
     hdrs = glob(["include/**/*.hpp"]),
     srcs = glob(["src/**"], exclude=["src/**/*_test.cpp"]),
     includes = [ "include" ],
-    copts = [
-        "-Ioak/src"
-    ],
     deps = [
         "//runtime",
         "@oatpp",
@@ -16,9 +13,6 @@ cc_library(
 cc_test(
     name = "models_test",
     srcs = glob(["src/**/*_test.cpp", "src/**/*.hpp"]),
-    copts = [
-        "-Ioak/src"
-    ],
     deps = [
         ":oak",
         "@gtest//:gtest_main",
diff --git a/oak/src/oak/registrar.cpp b/oak/src/oak/registrar.cpp
index f7a5b54c9..1878ad5c4 100644
--- a/oak/src/oak/registrar.cpp
+++ b/oak/src/oak/registrar.cpp
@@ -20,7 +20,7 @@
  * \see  oak/registrar.hpp
  */
 
-#include "oak/registrar.hpp"
+#include <oak/registrar.hpp>
 
 #include <map>
 #include <memory>
@@ -30,8 +30,9 @@
 
 #include <cloe/handler.hpp>  // for Request, Response, Handler
 
-#include "oak/request_stub.hpp"  // for RequestStub
-#include "oak/server.hpp"        // for Server
+#include <oak/server.hpp>        // for Server
+
+#include "request_stub.hpp"  // for RequestStub
 
 namespace oak {
 
diff --git a/oak/src/oak/route_muxer_test.cpp b/oak/src/oak/route_muxer_test.cpp
index 56c385d08..9ed9f0ce1 100644
--- a/oak/src/oak/route_muxer_test.cpp
+++ b/oak/src/oak/route_muxer_test.cpp
@@ -28,7 +28,7 @@
 #include <vector>     // for vector<>
 using namespace std;  // NOLINT(build/namespaces)
 
-#include "oak/route_muxer.hpp"  // for Muxer<>
+#include <oak/route_muxer.hpp>  // for Muxer<>
 using oak::Muxer;
 using oak::Parameters;
 
diff --git a/oak/src/oak/server.cpp b/oak/src/oak/server.cpp
index 07c8e54c1..6a2cb119d 100644
--- a/oak/src/oak/server.cpp
+++ b/oak/src/oak/server.cpp
@@ -38,8 +38,9 @@
 #include <fable/json.hpp>        // for Json
 using namespace cloe;            // NOLINT(build/namespaces)
 
-#include "oak/request_stub.hpp"  // for RequestStub
-#include "oak/route_muxer.hpp"   // for Muxer<>
+#include <oak/route_muxer.hpp>   // for Muxer<>
+
+#include "request_stub.hpp"  // for RequestStub
 
 namespace oak {
 
diff --git a/oak/src/oak/server_test.cpp b/oak/src/oak/server_test.cpp
index 79aee30e3..ce6bb4980 100644
--- a/oak/src/oak/server_test.cpp
+++ b/oak/src/oak/server_test.cpp
@@ -38,9 +38,10 @@
 #include <cloe/registrar.hpp>
 #include <fable/utility/gtest.hpp>
 
-#include "oak/curl.hpp"       // for Curl
-#include "oak/registrar.hpp"  // for Registrar
-#include "oak/server.hpp"     // for Server
+#include <oak/registrar.hpp>  // for Registrar
+#include <oak/server.hpp>     // for Server
+
+#include "curl.hpp"       // for Curl
 
 using namespace std;  // NOLINT(build/namespaces)