mirror of
https://github.com/microsoft/mimalloc.git
synced 2024-12-26 12:41:10 +08:00
remove the need for cmake patch in vcpkg port
This commit is contained in:
parent
bd04cec1c4
commit
4aa97336f7
@ -339,6 +339,10 @@ if (MSVC AND MSVC_VERSION GREATER_EQUAL 1914)
|
|||||||
list(APPEND mi_cflags /Zc:__cplusplus)
|
list(APPEND mi_cflags /Zc:__cplusplus)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(MINGW)
|
||||||
|
add_definitions(-D_WIN32_WINNT=0x600)
|
||||||
|
endif()
|
||||||
|
|
||||||
# extra needed libraries
|
# extra needed libraries
|
||||||
|
|
||||||
# we prefer -l<lib> test over `find_library` as sometimes core libraries
|
# we prefer -l<lib> test over `find_library` as sometimes core libraries
|
||||||
@ -383,6 +387,7 @@ endif()
|
|||||||
|
|
||||||
# dynamic/shared library and symlinks always go to /usr/local/lib equivalent
|
# dynamic/shared library and symlinks always go to /usr/local/lib equivalent
|
||||||
set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}")
|
set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
set(mi_install_bindir "${CMAKE_INSTALL_BINDIR}")
|
||||||
|
|
||||||
# static libraries and object files, includes, and cmake config files
|
# static libraries and object files, includes, and cmake config files
|
||||||
# are either installed at top level, or use versioned directories for side-by-side installation (default)
|
# are either installed at top level, or use versioned directories for side-by-side installation (default)
|
||||||
@ -466,10 +471,10 @@ if(MI_BUILD_SHARED)
|
|||||||
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${MIMALLOC_REDIRECT_SUFFIX}.dll" $<TARGET_FILE_DIR:mimalloc>
|
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")
|
COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory")
|
||||||
install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir})
|
install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_bindir})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY)
|
install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${mi_install_bindir} LIBRARY DESTINATION ${mi_install_libdir})
|
||||||
install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
|
install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user