From be05b232e8a51e076aae6d8f4a5c3049ce51cb01 Mon Sep 17 00:00:00 2001 From: Daan Date: Fri, 10 Jan 2025 08:44:31 -0800 Subject: [PATCH] fix obj path on windows --- CMakeLists.txt | 2 +- contrib/vcpkg/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eb15a39..68065741 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -634,7 +634,7 @@ if (MI_BUILD_OBJECT) ) # Copy the generated object file (`static.o`) to the output directory (as `mimalloc.o`) - if(WIN32) + if(CMAKE_GENERATOR MATCHES "^Visual Studio.*$") set(mimalloc-obj-static "${CMAKE_CURRENT_BINARY_DIR}/mimalloc-obj.dir/$/static${CMAKE_C_OUTPUT_EXTENSION}") else() set(mimalloc-obj-static "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION}") diff --git a/contrib/vcpkg/readme.md b/contrib/vcpkg/readme.md index d1b366a5..a001cdb0 100644 --- a/contrib/vcpkg/readme.md +++ b/contrib/vcpkg/readme.md @@ -28,7 +28,7 @@ target_link_libraries(main PRIVATE mimalloc) # Acknowledgements -The original port for vckpg was contributed by various people, including: @vicroms, @myd7349, @PhoubeHui, @LilyWangL, +The original port for vckpg was contributed by many people, including: @vicroms, @myd7349, @PhoubeHui, @LilyWangL, @JonLiu1993, @RT2Code, Remy Tassoux, @wangao, @BillyONeal, @jiayuehua, @dg0yt, @gerar-ryan-immersaview, @nickdademo, and @jimwang118 -- Thank you so much!