Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix building gtests and bplayer after recent NumaAPI addition.

Browse Source 
Seriously... like, seriously...
This commit is contained in:
Bastien Montagne
2018-11-28 16:50:02 +01:00
parent ce927e15e0
commit c16321cb9d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blenderplayer/CMakeLists.txt
View File

@@ -162,6 +162,7 @@ endif()
extern_wcwidth extern_wcwidth
bf_intern_libmv bf_intern_libmv
extern_sdlew extern_sdlew
bf_intern_numaapi
) )
if(NOT WITH_SYSTEM_GLOG) if(NOT WITH_SYSTEM_GLOG)

6
tests/gtests/blenlib/CMakeLists.txt
View File

@@ -46,8 +46,8 @@ BLENDER_TEST(BLI_array_utils "bf_blenlib")
BLENDER_TEST(BLI_ghash "bf_blenlib") BLENDER_TEST(BLI_ghash "bf_blenlib")
BLENDER_TEST(BLI_hash_mm2a "bf_blenlib") BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
BLENDER_TEST(BLI_heap "bf_blenlib") BLENDER_TEST(BLI_heap "bf_blenlib")
BLENDER_TEST(BLI_kdopbvh "bf_blenlib") BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_numaapi")
BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib") BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib;bf_intern_numaapi")
BLENDER_TEST(BLI_listbase "bf_blenlib") BLENDER_TEST(BLI_listbase "bf_blenlib")
BLENDER_TEST(BLI_math_base "bf_blenlib") BLENDER_TEST(BLI_math_base "bf_blenlib")
BLENDER_TEST(BLI_math_color "bf_blenlib") BLENDER_TEST(BLI_math_color "bf_blenlib")
@@ -57,7 +57,7 @@ BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
BLENDER_TEST(BLI_stack "bf_blenlib") BLENDER_TEST(BLI_stack "bf_blenlib")
BLENDER_TEST(BLI_string "bf_blenlib") BLENDER_TEST(BLI_string "bf_blenlib")
BLENDER_TEST(BLI_string_utf8 "bf_blenlib") BLENDER_TEST(BLI_string_utf8 "bf_blenlib")
BLENDER_TEST(BLI_task "bf_blenlib") BLENDER_TEST(BLI_task "bf_blenlib;bf_intern_numaapi")
BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib") BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")