KF-6 Reorganize files by categories

CMakeLists.txt

@@ -49,4 +49,4 @@ if(${IS_TOPLEVEL_PROJECT})
     endif()
 endif()
 
-# TODO: add install target
+# TODO: add install target

include/CMakeLists.txt

@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(kf)
+
+add_library(${PROJECT_NAME} INTERFACE)
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME}
+    INTERFACE
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/kf>
+)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+
+# Add a pseudo-project to make kf headers visible in IDE
+file(GLOB_RECURSE ${PROJECT_NAME}_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/kf/*)
+
+# Organize files into filters matching their relative paths
+foreach(header ${${PROJECT_NAME}_HEADERS})
+    file(RELATIVE_PATH rel_path "${CMAKE_CURRENT_SOURCE_DIR}" "${header}")
+    get_filename_component(rel_dir "${rel_path}" DIRECTORY)
+    if(rel_dir)
+        string(REPLACE "/" "\\" filter "${rel_dir}")
+        source_group("${filter}" FILES "${header}")
+    endif()
+endforeach()
+
+add_custom_target(${PROJECT_NAME}-headers SOURCES ${${PROJECT_NAME}_HEADERS})

include/kf/DoubleLinkedListConstIterator.h → include/kf/containers/DoubleLinkedListConstIterator.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "DoubleLinkedListEntry.h"
 
 namespace kf
 {

include/kf/DoubleLinkedListDescendingIterator.h → include/kf/containers/DoubleLinkedListDescendingIterator.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "DoubleLinkedListEntry.h"
 
 namespace kf
 {

include/kf/DoubleLinkedListDestroyer.h → include/kf/containers/DoubleLinkedListDestroyer.h

@@ -3,6 +3,8 @@
 
 namespace kf
 {
+    // TODO: move to DoubleLinkedList
+
     class DoubleLinkedListDestroyer
     {
     public:

include/kf/DoubleLinkedListIterator.h → include/kf/containers/DoubleLinkedListIterator.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "DoubleLinkedListEntry.h"
 
 namespace kf
 {

include/kf/LinkedTreeMap.h → include/kf/containers/LinkedTreeMap.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "GenericTableAvl.h"
 #include <functional>
 #include <utility>
+#include "GenericTableAvl.h"
 #include "DoubleLinkedList.h"
 
 namespace kf

include/kf/Base64.h → include/kf/encoding/Base64.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "USimpleString.h"
+#include "kf/string/USimpleString.h"
 #include <span>
 
 namespace kf

include/kf/Hex.h → include/kf/encoding/Hex.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "USimpleString.h"
-#include "ASimpleString.h"
+#include "kf/string/USimpleString.h"
+#include "kf/string/ASimpleString.h"
 #include <span>
 #include <array>
 

include/kf/TextDetector.h → include/kf/encoding/TextDetector.h

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <intrin.h>
 #include "EncodingDetector.h"
-#include "SpanUtils.h"
+#include "kf/containers/SpanUtils.h"
 
 namespace kf
 {

include/kf/FilenameUtils.h → include/kf/filesystem/FilenameUtils.h

@@ -1,9 +1,10 @@
 #pragma once
-#include "USimpleString.h"
 #include <utility>
+#include "kf/string/USimpleString.h"
 
 namespace kf
 {
+    // TODO: Implement a Path type instead of utils
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // FilenameUtils - inspired by http://commons.apache.org/proper/commons-io/apidocs/org/apache/commons/io/FilenameUtils.html
 

include/kf/FltWorkItem.h → include/kf/guard/FltWorkItem.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "ScopeFailure.h"
-#include "stl/memory"
+#include "kf/stl/memory"
+#include "kf/guard/ScopeFailure.h"
 
 namespace kf
 {

include/kf/Scanner.h → include/kf/string/Scanner.h

@@ -1,7 +1,5 @@
 #pragma once
-#include "USimpleString.h"
-#include <span>
-#include "SpanUtils.h"
+#include "kf/containers/SpanUtils.h"
 
 namespace kf
 {

include/kf/ConditionVariable.h → include/kf/sync/ConditionVariable.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "EResource.h"
 #include "Semaphore.h"
 

include/kf/Thread.h → include/kf/thread/Thread.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "ObjectAttributes.h"
-#include "Guard.h"
+#include "kf/guard/ObjectAttributes.h"
+#include "kf/guard/Guard.h"
 
 namespace kf
 {

include/kf/FltCommunicationPort.h → include/kf/transport/FltCommunicationPort.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "ObjectAttributes.h"
-#include "ScopeExit.h"
-#include "VariableSizeStruct.h"
+#include "kf/guard/ObjectAttributes.h"
+#include "kf/guard/ScopeExit.h"
+#include "kf/guard/VariableSizeStruct.h"
 
 namespace kf
 {

test/HexTest.cpp

@@ -1,7 +1,7 @@
 #include "pch.h"
-#include <kf/Hex.h>
+#include <kf/encoding/Hex.h>
 
 SCENARIO("TODO: implement")
 {
     REQUIRE(true);
-}
+}