mirror of https://github.com/microsoft/vcpkg.git
[mimalloc] Update the CMake configuration options (#23802)
* [mimalloc] Portfile configuration fixes and improvements * [mimalloc] Update version files
This commit is contained in:
parent
e71f053e1d
commit
9b7e03938d
|
|
@ -9,18 +9,8 @@
|
|||
endif()
|
||||
|
||||
- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY)
|
||||
+ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir} NAMELINK_SKIP)
|
||||
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
|
||||
@@ -370,9 +370,6 @@ # install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_objdir})
|
||||
|
||||
# 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_objdir}
|
||||
- RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} )
|
||||
endif()
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -24,15 +24,13 @@ vcpkg_cmake_configure(
|
|||
OPTIONS_RELEASE
|
||||
-DMI_DEBUG_FULL=OFF
|
||||
OPTIONS
|
||||
-DMI_INTERPOSE=ON
|
||||
-DMI_USE_CXX=OFF
|
||||
-DMI_USE_CXX=ON
|
||||
-DMI_BUILD_TESTS=OFF
|
||||
-DMI_BUILD_OBJECT=OFF
|
||||
${FEATURE_OPTIONS}
|
||||
-DMI_BUILD_STATIC=${MI_BUILD_STATIC}
|
||||
-DMI_BUILD_SHARED=${MI_BUILD_SHARED}
|
||||
-DMI_INSTALL_TOPLEVEL=ON
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
MI_INTERPOSE
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "mimalloc",
|
||||
"version": "2.0.5",
|
||||
"port-version": 1,
|
||||
"description": "Compact general purpose allocator with excellent performance",
|
||||
"homepage": "https://github.com/microsoft/mimalloc",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -4470,7 +4470,7 @@
|
|||
},
|
||||
"mimalloc": {
|
||||
"baseline": "2.0.5",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"minc": {
|
||||
"baseline": "2.4.03",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4",
|
||||
"version": "2.0.5",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67",
|
||||
"version": "2.0.5",
|
||||
|
|
|
|||
Loading…
Reference in New Issue