Fix header search paths by importing submodules and using directives in the project config

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "extern/expect"]
+	path = extern/expect
+	url = freenas:utility/expect.git
+[submodule "extern/resource_factory"]
+	path = extern/resource_factory
+	url = freenas:utility/resource_factory.git
+[submodule "extern/variant"]
+	path = extern/variant
+	url = freenas:utility/variant.git

extern/expect

@@ -0,0 +1 @@
+Subproject commit 5d08b8fcbfc385310666c55b5d070a99fab2c2c0

extern/resource_factory

@@ -0,0 +1 @@
+Subproject commit 1a2b2209461a0bb046e69b183e3ac491495fb1e4

extern/variant

@@ -0,0 +1 @@
+Subproject commit caba555bb2dac91535e786d84ee71a29c93118df

include/logger/properties.h

@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "../../../types/variant/variant.hpp"
+#include "variant/variant.hpp"
 
 namespace logging {
   struct properties;

logger.xcodeproj/project.pbxproj

@@ -416,7 +416,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../../paradigm/declarative/expect/include/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/extern/expect/include/ $(PROJECT_DIR)/extern/resource_factory/include/ $(PROJECT_DIR)/extern/";
 			};
 			name = Debug;
 		};
@@ -450,7 +450,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../../paradigm/declarative/expect/include/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/extern/expect/include/ $(PROJECT_DIR)/extern/resource_factory/include/ $(PROJECT_DIR)/extern/";
 			};
 			name = Release;
 		};

src/log_manager.cxx

@@ -10,8 +10,8 @@
 #include <memory>
 #include <unordered_map>
 
-#include "../../../paradigm/declarative/expect/include/expect/expect.hpp"
-#include "../../../types/resource_factory/include/resource_factory/prototype_factory.hpp"
+#include "expect/expect.hpp"
+#include "resource_factory/prototype_factory.hpp"
 
 #include "common.h"
 #include "logger/c_logger.h"

src/loggers/console_appender.cxx

@@ -7,8 +7,8 @@
 
 #include <iostream>
 
-#include "../../../../paradigm/declarative/expect/include/expect/expect.hpp"
-#include "../../../../types/resource_factory/include/resource_factory/prototype_factory.hpp"
+#include "expect/expect.hpp"
+#include "resource_factory/prototype_factory.hpp"
 
 #include "logger/detail/appender.h"
 #include "logger/log_manager.h"

src/loggers/default_layout.cxx

@@ -5,7 +5,7 @@
 //  Created by Sam Jaffe on 4/3/19.
 //
 
-#include "../../../../types/resource_factory/include/resource_factory/prototype_factory.hpp"
+#include "resource_factory/prototype_factory.hpp"
 
 #include "logger/detail/layout.h"
 #include "logger/log_manager.h"

src/loggers/file_appender.cxx

@@ -7,8 +7,8 @@
 
 #include <fstream>
 
-#include "../../../../paradigm/declarative/expect/include/expect/expect.hpp"
-#include "../../../../types/resource_factory/include/resource_factory/prototype_factory.hpp"
+#include "expect/expect.hpp"
+#include "resource_factory/prototype_factory.hpp"
 
 #include "logger/detail/appender.h"
 #include "logger/log_manager.h"

src/loggers/pattern_layout.cxx

@@ -5,7 +5,7 @@
 //  Created by Sam Jaffe on 4/4/19.
 //
 
-#include "../../../../types/resource_factory/include/resource_factory/prototype_factory.hpp"
+#include "resource_factory/prototype_factory.hpp"
 
 #include "logger/detail/layout.h"
 #include "logger/format.h"

src/loggers/properties.cxx

@@ -7,7 +7,7 @@
 
 #include "logger/properties.h"
 
-#include "../../../../paradigm/declarative/expect/include/expect/expect.hpp"
+#include "expect/expect.hpp"
 
 #include "logger/exception.h"
 

test/log_manager_test.cxx

@@ -5,7 +5,7 @@
 //  Created by Sam Jaffe on 4/2/19.
 //
 
-#include "../../../types/resource_factory/include/resource_factory/prototype_factory.hpp"
+#include "resource_factory/prototype_factory.hpp"
 
 #include "logger/c_logger.h"
 #include "logger/log_manager.h"