From 60f8108324dcc3859640799168fb33ea865cf815 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Sat, 7 Oct 2023 12:24:15 +0200
Subject: cmake: move modules to source

---
 conanfile.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'conanfile.py')

diff --git a/conanfile.py b/conanfile.py
index cc79bae..83040b7 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -38,6 +38,8 @@ class KernelConan(ConanFile):
         toolchain.variables["TEACHOS_DESCRIPTION"] = self.description
         toolchain.variables["TEACHOS_HOMEPAGE_URL"] = self.homepage
         toolchain.variables["TEACHOS_VERSION"] = self.version
+        toolchain.blocks["teachos_cmake_modules"] = CMakeModulesPathBlock
+        toolchain.blocks["teachos_cmake_modules"].values["root"] = self.source_folder
         toolchain.blocks["teachos_platform"] = PlatformIncludeBlock
         toolchain.blocks["teachos_platform"].values["platform"] = self.settings.arch
         toolchain.blocks.remove("cmake_flags_init")
@@ -49,8 +51,7 @@ class KernelConan(ConanFile):
 
 
 class PlatformIncludeBlock:
-    template = 'include("../cmake/Platforms/{{platform}}.cmake")'
+    template = 'include("{{platform}}")'
 
-
-def context(self):
-    return {"platform": None}
+class CMakeModulesPathBlock:
+    template = 'list(APPEND CMAKE_MODULE_PATH "{{root}}/cmake/Modules" "{{root}}/cmake/Platforms")'
-- 
cgit v1.2.3