From 9fda2f7d6051f5071db415162cde57b19cfb9753 Mon Sep 17 00:00:00 2001 From: Warwick Date: Thu, 13 Mar 2025 18:01:30 +0000 Subject: [PATCH] Move cglm to cpm because fedora hates me --- .gitignore | 7 +++++++ CMakeLists.txt | 11 ++++++++++- cpm-package-lock.cmake | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 cpm-package-lock.cmake diff --git a/.gitignore b/.gitignore index 89dff7e..3f39ded 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,10 @@ shaders/*.spv # Binaries new-engine + +# CPM +CPM_modules/ +CPackConfig.cmake +CPackSourceConfig.cmake +_deps/ +cmake/ diff --git a/CMakeLists.txt b/CMakeLists.txt index f774bd5..afd046b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,11 +12,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Build Dependancies find_package(PkgConfig REQUIRED) +# download CPM.cmake +file( + DOWNLOAD + https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.38.3/CPM.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake + EXPECTED_HASH SHA256=cc155ce02e7945e7b8967ddfaff0b050e958a723ef7aad3766d368940cb15494 +) +include(${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake) + # Dependancies find_package(Vulkan REQUIRED) find_package(glfw3 REQUIRED) set(GLFW_LIBRARIES glfw) -pkg_check_modules(CGLM REQUIRED cglm) +CPMAddPackage("gh:recp/cglm#v0.9.6") #find_package(m REQUIRED) # Include dirs diff --git a/cpm-package-lock.cmake b/cpm-package-lock.cmake new file mode 100644 index 0000000..67eeaba --- /dev/null +++ b/cpm-package-lock.cmake @@ -0,0 +1,3 @@ +# CPM Package Lock +# This file should be committed to version control +