From 4f622c9a080b9f519ee9f7829b154e1401bb96ff Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Wed, 20 May 2020 02:14:49 +0200
Subject: Fix Windows build after recent guardedalloc changes

---
 intern/guardedalloc/CMakeLists.txt                 | 8 ++++++++
 source/blender/makesdna/intern/CMakeLists.txt      | 4 ++++
 source/blender/makesrna/intern/CMakeLists.txt      | 4 ++++
 tests/gtests/blenlib/BLI_linklist_lockfree_test.cc | 2 --
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 1d4f846623c..cb24df65ba0 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -53,6 +53,14 @@ if(WIN32 AND NOT UNIX)
 
     mmap_win.h
   )
+
+  list(APPEND INC_SYS
+    ${PTHREADS_INC}
+  )
+
+  list(APPEND LIB
+    ${PTHREADS_LIBRARIES}
+  )
 endif()
 
 # Jemalloc 5.0.0+ needs extra configuration.
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 1b0bf086269..01e3971a216 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -58,6 +58,10 @@ setup_platform_linker_flags()
 
 add_executable(makesdna ${SRC} ${SRC_DNA_INC})
 
+if(WIN32 AND NOT UNIX)
+  target_link_libraries(makesdna ${PTHREADS_LIBRARIES})
+endif()
+
 # Output dna.c
 add_custom_command(
   OUTPUT
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index cd05aba8794..024bdbe5ed5 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -394,6 +394,10 @@ add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
 target_link_libraries(makesrna bf_dna)
 target_link_libraries(makesrna bf_dna_blenlib)
 
+if(WIN32 AND NOT UNIX)
+  target_link_libraries(makesrna ${PTHREADS_LIBRARIES})
+endif()
+
 # Output rna_*_gen.c
 # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes
 add_custom_command(
diff --git a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
index 023d02e5075..d1a527d57ac 100644
--- a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
+++ b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
@@ -87,9 +87,7 @@ TEST(LockfreeLinkList, InsertMultipleConcurrent)
     BLI_task_pool_push(pool, concurrent_insert, POINTER_FROM_INT(i), false, NULL);
   }
   /* Run all the tasks. */
-  BLI_threaded_malloc_begin();
   BLI_task_pool_work_and_wait(pool);
-  BLI_threaded_malloc_end();
   /* Verify we've got all the data properly inserted. */
   EXPECT_EQ(list.head, &list.dummy_node);
   bool *visited_nodes = (bool *)MEM_callocN(sizeof(bool) * num_nodes, "visited nodes");
-- 
cgit v1.2.3