The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[mimalloc] Install mimalloc-redirect.dll to CMAKE_INSTALL_BINDIR (#11632)

Browse Source
This commit is contained in:
Lily 2020-06-02 07:17:34 +08:00 committed by GitHub
parent 2f28b35d77
commit 6fb72ff00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/mimalloc/CONTROL
View File

@ -1,5 +1,5 @@
Source: mimalloc Source: mimalloc
Version: 1.6.1 Version: 1.6.1-1
Description: Compact general purpose allocator with excellent performance Description: Compact general purpose allocator with excellent performance
Homepage: https://github.com/microsoft/mimalloc Homepage: https://github.com/microsoft/mimalloc

16
ports/mimalloc/fix-cmake.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index e16830a..c68ae65 100644 index e16830a..3c7c8da 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -166,6 +166,7 @@ message(STATUS "") @@ -166,6 +166,7 @@ message(STATUS "")
@ -10,7 +10,7 @@ index e16830a..c68ae65 100644
# shared library # shared library
add_library(mimalloc SHARED ${mi_sources}) add_library(mimalloc SHARED ${mi_sources})
set_target_properties(mimalloc PROPERTIES VERSION ${mi_version} OUTPUT_NAME ${mi_basename} ) set_target_properties(mimalloc PROPERTIES VERSION ${mi_version} OUTPUT_NAME ${mi_basename} )
@@ -178,12 +179,19 @@ target_include_directories(mimalloc PUBLIC @@ -178,12 +179,27 @@ target_include_directories(mimalloc PUBLIC
) )
if(WIN32) if(WIN32)
# On windows copy the mimalloc redirection dll too. # On windows copy the mimalloc redirection dll too.
@ -21,11 +21,19 @@ index e16830a..c68ae65 100644
+ add_custom_command(TARGET mimalloc POST_BUILD + add_custom_command(TARGET mimalloc POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.dll" $<TARGET_FILE_DIR:mimalloc> 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") COMMENT "Copy mimalloc-redirect.dll to output directory")
+ install (
+ FILES $<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect.dll
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.lib) + target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.lib)
+ add_custom_command(TARGET mimalloc POST_BUILD + add_custom_command(TARGET mimalloc POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.dll" $<TARGET_FILE_DIR:mimalloc> + 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") + COMMENT "Copy mimalloc-redirect32.dll to output directory")
+ install (
+ FILES $<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect32.dll
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+ endif() + endif()
endif() endif()
- -
@ -33,7 +41,7 @@ index e16830a..c68ae65 100644
# static library # static library
add_library(mimalloc-static STATIC ${mi_sources}) add_library(mimalloc-static STATIC ${mi_sources})
target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB) target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
@@ -201,10 +209,13 @@ if(WIN32) @@ -201,10 +217,13 @@ if(WIN32)
else() else()
set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename})
endif() endif()
@ -50,7 +58,7 @@ index e16830a..c68ae65 100644
install(FILES include/mimalloc.h DESTINATION ${mi_install_dir}/include) install(FILES include/mimalloc.h DESTINATION ${mi_install_dir}/include)
install(FILES include/mimalloc-override.h DESTINATION ${mi_install_dir}/include) install(FILES include/mimalloc-override.h DESTINATION ${mi_install_dir}/include)
install(FILES include/mimalloc-new-delete.h DESTINATION ${mi_install_dir}/include) install(FILES include/mimalloc-new-delete.h DESTINATION ${mi_install_dir}/include)
@@ -234,9 +245,6 @@ target_include_directories(mimalloc-obj PUBLIC @@ -234,9 +253,6 @@ target_include_directories(mimalloc-obj PUBLIC
# the FILES expression can also be: $<TARGET_OBJECTS:mimalloc-obj> # 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 # but that fails cmake versions less than 3.10 so we leave it as is for now

1
ports/mimalloc/portfile.cmake
View File

@ -66,4 +66,3 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif() endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)