diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-09-17 23:05:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 08:05:23 -0700 |
| commit | 6edc46f862f9931d174ffbd45fb07f8df3edf040 (patch) | |
| tree | da734441ba37ab3c1816eb0cb401e92bf84462c7 /ports/mimalloc/fix-cmake.patch | |
| parent | ccd2cf07cf657928d976941f5137650932ebf9f8 (diff) | |
| download | vcpkg-6edc46f862f9931d174ffbd45fb07f8df3edf040.tar.gz vcpkg-6edc46f862f9931d174ffbd45fb07f8df3edf040.zip | |
[mimalloc] update to v1.7.2 (#20188)
* [mimalloc] update to v1.7.2
* update version
* update suggestion review
* update version
* update patch EOF
* update version
Diffstat (limited to 'ports/mimalloc/fix-cmake.patch')
| -rw-r--r-- | ports/mimalloc/fix-cmake.patch | 54 |
1 files changed, 17 insertions, 37 deletions
diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index 42d74f8c2..2824055a5 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -1,58 +1,38 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 37616eb..4c81e6a 100644 +index b56953c..d7ad3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -251,14 +251,28 @@ if(MI_BUILD_SHARED) - ) - if(WIN32) - # On windows copy the mimalloc redirection dll too. -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) - target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.lib) +@@ -279,10 +279,12 @@ if(MI_BUILD_SHARED) add_custom_command(TARGET mimalloc POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.dll" $<TARGET_FILE_DIR:mimalloc> - COMMENT "Copy mimalloc-redirect.dll to output directory") -- endif() + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $<TARGET_FILE_DIR:mimalloc> + COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") + install ( -+ FILES $<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect.dll ++ FILES $<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll + DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) -+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) -+ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.lib) -+ add_custom_command(TARGET mimalloc POST_BUILD -+ COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.dll" $<TARGET_FILE_DIR:mimalloc> -+ COMMENT "Copy mimalloc-redirect32.dll to output directory") -+ install ( -+ FILES $<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect32.dll -+ DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) -+ endif() -+endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_dir} LIBRARY) -- install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) ++ ) + endif() +- +- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) +- install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) endif() # static library -@@ -281,9 +295,11 @@ if (MI_BUILD_STATIC) - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_dir}) -+ install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION lib) +@@ -308,6 +310,8 @@ if (MI_BUILD_STATIC) + install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) endif() -+install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) ++install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + # install include files - install(FILES include/mimalloc.h DESTINATION ${mi_install_dir}/include) - install(FILES include/mimalloc-override.h DESTINATION ${mi_install_dir}/include) -@@ -315,9 +331,6 @@ if (MI_BUILD_OBJECT) + install(FILES include/mimalloc.h DESTINATION ${mi_install_incdir}) + install(FILES include/mimalloc-override.h DESTINATION ${mi_install_incdir}) +@@ -342,9 +346,6 @@ if (MI_BUILD_OBJECT) # the FILES expression can also be: $<TARGET_OBJECTS:mimalloc-obj> # but that fails cmake versions less than 3.10 so we leave it as is for now - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_dir} +- DESTINATION ${mi_install_libdir} - RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) endif() |