Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 28 Nov 2018 15:52:47 +0000 (16:52 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 28 Nov 2018 15:52:47 +0000 (16:52 +0100)
Conflicts:
source/blenderplayer/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt

1  2 
tests/gtests/blenlib/CMakeLists.txt

index e652fbecb362595d7c193331734b21b94b55ba0e,43883e83f6e25dbd96f035f1f0f2149c20b5c040..e399d4651f584c00e335ec2d6428c944514f28f6
@@@ -43,24 -43,21 +43,24 @@@ endif(
  
  BLENDER_TEST(BLI_array_store "bf_blenlib")
  BLENDER_TEST(BLI_array_utils "bf_blenlib")
 +BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")
  BLENDER_TEST(BLI_ghash "bf_blenlib")
  BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
  BLENDER_TEST(BLI_heap "bf_blenlib")
- BLENDER_TEST(BLI_kdopbvh "bf_blenlib")
- BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib")
 +BLENDER_TEST(BLI_heap_simple "bf_blenlib")
+ BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_numaapi")
+ BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib;bf_intern_numaapi")
  BLENDER_TEST(BLI_listbase "bf_blenlib")
  BLENDER_TEST(BLI_math_base "bf_blenlib")
  BLENDER_TEST(BLI_math_color "bf_blenlib")
  BLENDER_TEST(BLI_math_geom "bf_blenlib")
 +BLENDER_TEST(BLI_memiter "bf_blenlib")
  BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
  BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
  BLENDER_TEST(BLI_stack "bf_blenlib")
  BLENDER_TEST(BLI_string "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")