diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
commit | e76ff4df4123b5517599930629dbcf0507b582e9 (patch) | |
tree | 3cf9a67f3a3a05c678f39a04533da81f56e66c02 /intern/guardedalloc/CMakeLists.txt | |
parent | 15dd6cb66887eb83fcc3ecf44c3b42a53161e390 (diff) | |
parent | 528f0b95c4462b2e429600a566ca0434c90310f6 (diff) |
Merge branch 'master' into tmp-widget-optitmp-widget-opti
# Conflicts:
# source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
Diffstat (limited to 'intern/guardedalloc/CMakeLists.txt')
-rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 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. |