Skip to content

Commit 881d5e3

Browse files
authored
Merge pull request #1047 from ognevny/patch-1
cmake: don't change properties of import lib on Windows/MinGW
2 parents 246b3bc + 797ca19 commit 881d5e3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ if(MI_BUILD_SHARED)
584584
install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
585585
install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
586586

587-
if(WIN32)
587+
if(WIN32 AND NOT MINGW)
588588
# On windows, the import library name for the dll would clash with the static mimalloc.lib library
589589
# so we postfix the dll import library with `.dll.lib` (and also the .pdb debug file)
590590
set_property(TARGET mimalloc PROPERTY ARCHIVE_OUTPUT_NAME "${mi_libname}.dll" )

0 commit comments

Comments
 (0)