RickRongen/yak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: made cmakelist more robust

Browse Source
This commit is contained in:
Rick Rongen
2023-09-29 22:22:53 +02:00
parent 0567926814
commit 85a9336218
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1,5 +1,7 @@
project(yak C ASM)
cmake_minimum_required(VERSION 3.24.0) cmake_minimum_required(VERSION 3.24.0)
project(yak C ASM)
string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${CMAKE_C_COMPILER_VERSION})
include(FetchContent) include(FetchContent)

2
yak-kernel/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ option(USE_DEBUG "Enable debug code" ON)
option(USE_LIMINE "Enable support for the limine boot protocol" ON) option(USE_LIMINE "Enable support for the limine boot protocol" ON)
# Find builtins # Find builtins
list(APPEND BUILTINS_SEARCH /usr/lib/clang/15/lib/linux /usr/lib/clang/${CMAKE_C_COMPILER_VERSION}/lib/linux /usr/lib/clang/15.*.*/lib/linux) list(APPEND BUILTINS_SEARCH /usr/lib/clang/${CLANG_VERSION_MAJOR}/lib/linux /usr/lib/clang/${CMAKE_C_COMPILER_VERSION}/lib/linux)
find_library(BUILTINS_LIB find_library(BUILTINS_LIB
libclang_rt.builtins-x86_64.a libclang_rt.builtins-x86_64.a
PATHS ${BUILTINS_SEARCH}) PATHS ${BUILTINS_SEARCH})