Remove cmake submodule & replace with new CMX bootstrapper

karmakrafts · Aug 19, 2023 · 380094f · 380094f
1 parent 6b82b2c
commit 380094f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 41 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "cmake"]
-	path = cmake
-	url = https://github.com/karmakrafts/cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(kstd-platform LANGUAGES C CXX)
 option(KSTD_PLATFORM_BUILD_TESTS "Build unit tests for kstd-platform" OFF)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;")
-include(cmx)
+include(cmx-bootstrap)
 cmx_include_scripts()
 
 # Library

diff --git a/cmake b/cmake
diff --git a/cmake/cmx-bootstrap.cmake b/cmake/cmx-bootstrap.cmake
@@ -0,0 +1,15 @@
+if (NOT CMX_INCLUDED)
+    include(FetchContent)
+    set(CMX_VERSION master)
+
+    FetchContent_Declare(
+        cmx
+        GIT_REPOSITORY https://github.com/karmakrafts/cmx.git
+        GIT_TAG ${CMX_VERSION}
+    )
+    FetchContent_MakeAvailable(cmx)
+    set(CMAKE_MODULE_PATH "${cmx_SOURCE_DIR};")
+    include(cmx)
+
+    set(CMX_INCLUDED ON)
+endif ()# CMX_INCLUDED
diff --git a/update_cmake b/update_cmake