diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-16 11:19:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-16 11:19:03 +0300 |
| commit | 8ad93dd0098d8b8356bfce27f716488f9afd653e (patch) | |
| tree | ffe463a34c395cdac0d83df3a94e6593134a1b84 /source/blender/blenlib/CMakeLists.txt | |
| parent | 6ef5b422fce9deb1278b7092890ebe5e10227eae (diff) | |
| parent | 6617818c7a1f5729763aa214866b5d7dc0358f36 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 5bcf4303a84..80a8ef96eb3 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -50,6 +50,7 @@ set(SRC intern/BLI_kdopbvh.c intern/BLI_kdtree.c intern/BLI_linklist.c + intern/BLI_linklist_lockfree.c intern/BLI_memarena.c intern/BLI_memiter.c intern/BLI_mempool.c @@ -165,7 +166,7 @@ set(SRC BLI_kdtree.h BLI_lasso_2d.h BLI_link_utils.h - BLI_linklist.h + BLI_linklist_lockfree.h BLI_linklist_stack.h BLI_listbase.h BLI_math.h |