[Bf-blender-cvs] [c16321cb9dc] master: Fix building gtests and bplayer after recent NumaAPI addition.

Bastien Montagne noreply at git.blender.org
Wed Nov 28 16:50:47 CET 2018


Commit: c16321cb9dc983d174e7f5888d66118ef5f76a92
Author: Bastien Montagne
Date:   Wed Nov 28 16:50:02 2018 +0100
Branches: master
https://developer.blender.org/rBc16321cb9dc983d174e7f5888d66118ef5f76a92

Fix building gtests and bplayer after recent NumaAPI addition.

Seriously... like, seriously...

===================================================================

M	source/blenderplayer/CMakeLists.txt
M	tests/gtests/blenlib/CMakeLists.txt

===================================================================

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index dbfd1d9d520..4c9ee8180fd 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -162,6 +162,7 @@ endif()
 		extern_wcwidth
 		bf_intern_libmv
 		extern_sdlew
+		bf_intern_numaapi
 	)
 
 	if(NOT WITH_SYSTEM_GLOG)
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index a3f62d8a05d..43883e83f6e 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -46,8 +46,8 @@ BLENDER_TEST(BLI_array_utils "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_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")
@@ -57,7 +57,7 @@ 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")



More information about the Bf-blender-cvs mailing list