From e94133922296ad3ab4e1b1141ebfe66a3af06aab Mon Sep 17 00:00:00 2001
From: Peter M. Groen <pgroen@orion64.osdev.nl>
Date: Sun, 15 Jan 2023 18:03:22 +0100
Subject: [PATCH] New cmake setup

---
 scripts/submodules.list | 2 +-
 src/CMakeLists.txt      | 5 +++--
 tests/CMakeLists.txt    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/submodules.list b/scripts/submodules.list
index 169cd55..a05b06e 100644
--- a/scripts/submodules.list
+++ b/scripts/submodules.list
@@ -1,4 +1,4 @@
 SUB_MODULES_OPEN="cmake
-logutils"
+logger"
 
 SUB_MODULES_CLOSED=""
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 641a2d0..078670e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa_create_version_include/cmake)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake)
 include(projectheader)
 project_header(crypter)
 
@@ -7,6 +7,7 @@ find_package( Qt5Core REQUIRED )
 
 include_directories( SYSTEM
     ${Qt5Core_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/submodules/logger/src
 )
 
 include(compiler)
@@ -26,7 +27,7 @@ include(library)
 add_libraries(
     ${Qt5Core_LIBRARIES}
     crypto
-    logutils
+    logger
 )
 
 include(installation)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3635320..07a5369 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.0)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake)
 
 include(projectheader)
 project_header(test_logutils)
 
 include_directories( SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_SOURCE_DIR}/src
 )
 
 include(compiler)
--
libgit2 0.21.4