diff --git a/CMakeLists.txt b/CMakeLists.txt index d01853f..1760c94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,16 +16,20 @@ if(WIN32) endif() include(FetchContent) + FetchContent_Declare( mimalloc - GIT_REPOSITORY https://github.com/microsoft/mimalloc.git - GIT_TAG v3.1.5 + GIT_REPOSITORY https://pallas.t0byte.com/PallasDev/mimalloc.git + GIT_TAG main ) + set(MI_OVERRIDE OFF CACHE BOOL "" FORCE) set(MI_BUILD_SHARED OFF CACHE BOOL "" FORCE) set(MI_BUILD_STATIC ON CACHE BOOL "" FORCE) set(MI_USE_CXX OFF CACHE BOOL "" FORCE) +set(MI_BUILD_TESTS OFF CACHE BOOL "" FORCE) +set(MI_BUILD_OBJECT OFF CACHE BOOL "" FORCE) + FetchContent_MakeAvailable(mimalloc) - add_subdirectory(Source/DrangPlatform) diff --git a/CMakePresets.json b/CMakePresets.json index 024bcdc..05db59f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -8,7 +8,7 @@ "binaryDir": "${sourceDir}/build-${presetName}", "cacheVariables": { "CMAKE_C_COMPILER": "clang-cl.exe", - "CMAKE_CXX_COMPILER": "clang-cl.exe", + "CMAKE_CXX_COMPILER": false, "CMAKE_EXPORT_COMPILE_COMMANDS": true }, "condition": { @@ -24,7 +24,7 @@ "binaryDir": "${sourceDir}/build-${presetName}", "cacheVariables": { "CMAKE_C_COMPILER": "clang", - "CMAKE_CXX_COMPILER": "clang++", + "CMAKE_CXX_COMPILER": false, "CMAKE_EXPORT_COMPILE_COMMANDS": true }, "condition": {