fix: update mimalloc repository and enforce C mode
This commit is contained in:
parent
b30b7f641f
commit
d5c7ea29f9
2 changed files with 9 additions and 5 deletions
|
|
@ -16,16 +16,20 @@ if(WIN32)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(FetchContent)
|
include(FetchContent)
|
||||||
|
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
mimalloc
|
mimalloc
|
||||||
GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
|
GIT_REPOSITORY https://pallas.t0byte.com/PallasDev/mimalloc.git
|
||||||
GIT_TAG v3.1.5
|
GIT_TAG main
|
||||||
)
|
)
|
||||||
|
|
||||||
set(MI_OVERRIDE OFF CACHE BOOL "" FORCE)
|
set(MI_OVERRIDE OFF CACHE BOOL "" FORCE)
|
||||||
set(MI_BUILD_SHARED OFF CACHE BOOL "" FORCE)
|
set(MI_BUILD_SHARED OFF CACHE BOOL "" FORCE)
|
||||||
set(MI_BUILD_STATIC ON CACHE BOOL "" FORCE)
|
set(MI_BUILD_STATIC ON CACHE BOOL "" FORCE)
|
||||||
set(MI_USE_CXX OFF 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)
|
FetchContent_MakeAvailable(mimalloc)
|
||||||
|
|
||||||
|
|
||||||
add_subdirectory(Source/DrangPlatform)
|
add_subdirectory(Source/DrangPlatform)
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
"binaryDir": "${sourceDir}/build-${presetName}",
|
"binaryDir": "${sourceDir}/build-${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "clang-cl.exe",
|
"CMAKE_C_COMPILER": "clang-cl.exe",
|
||||||
"CMAKE_CXX_COMPILER": "clang-cl.exe",
|
"CMAKE_CXX_COMPILER": false,
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": true
|
"CMAKE_EXPORT_COMPILE_COMMANDS": true
|
||||||
},
|
},
|
||||||
"condition": {
|
"condition": {
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
"binaryDir": "${sourceDir}/build-${presetName}",
|
"binaryDir": "${sourceDir}/build-${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "clang",
|
"CMAKE_C_COMPILER": "clang",
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": false,
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": true
|
"CMAKE_EXPORT_COMPILE_COMMANDS": true
|
||||||
},
|
},
|
||||||
"condition": {
|
"condition": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue