From 2b911b0b10d2c4b36d5c15b0f21e3a80f0a48a76 Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Tue, 23 Jul 2019 09:36:58 -0700
Subject: [PATCH] fix cmake build on windows

---
 CMakeLists.txt | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec0fd99a..45d5f988 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,14 +121,28 @@ add_library(mimalloc SHARED ${mi_sources})
 set_target_properties(mimalloc PROPERTIES VERSION ${mi_version} NO_SONAME "YES" OUTPUT_NAME ${mi_basename} )
 target_compile_definitions(mimalloc PRIVATE ${mi_defines} MI_SHARED_LIB MI_SHARED_LIB_EXPORT)
 target_compile_options(mimalloc PRIVATE ${mi_cflags})
+target_link_libraries(mimalloc PUBLIC ${mi_libraries})
 target_include_directories(mimalloc PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:${mi_install_dir}/include>
 )
-target_link_libraries(mimalloc PUBLIC ${mi_libraries})
+if(WIN32)
+  # On windows copy the mimalloc redirection dll too.
+  target_link_libraries(mimalloc PRIVATE ../../bin/mimalloc-redirect)
+  add_custom_command(TARGET mimalloc POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy "../../bin/mimalloc-redirect.dll" $<TARGET_FILE_DIR:mimalloc>
+    COMMENT "Copy mimalloc-redirect.dll to output directory")
+endif()
 
 # static library
 add_library(mimalloc-static STATIC ${mi_sources})
+target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
+target_compile_options(mimalloc-static PRIVATE ${mi_cflags})
+target_link_libraries(mimalloc-static PUBLIC ${mi_libraries})
+target_include_directories(mimalloc-static PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:${mi_install_dir}/include>
+)
 if(WIN32)
   # When building both static and shared libraries on Windows, a static library should use a
   # different output name to avoid the conflict with the import library of a shared one.
@@ -137,14 +151,6 @@ if(WIN32)
 else()
   set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename})
 endif()
-target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
-target_compile_options(mimalloc-static PRIVATE ${mi_cflags})
-
-target_include_directories(mimalloc-static PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${mi_install_dir}/include>
-)
-target_link_libraries(mimalloc-static PUBLIC ${mi_libraries})
 
 # install static and shared library, and the include files
 install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_dir} LIBRARY NAMELINK_SKIP)