Cleanup: use stubs for eigen gtest
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 Aug 2017 05:19:25 +0000 (15:19 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 Aug 2017 05:21:09 +0000 (15:21 +1000)
tests/gtests/blenlib/BLI_kdopbvh_test.cc
tests/gtests/blenlib/BLI_math_geom_test.cc
tests/gtests/blenlib/BLI_polyfill2d_test.cc
tests/gtests/blenlib/CMakeLists.txt

index e713ddc16958631c84844deb3fa2a2f726d09fad..74db7cf20a018cf181df4dc067655f373de44eea 100644 (file)
@@ -12,6 +12,8 @@ extern "C" {
 #include "MEM_guardedalloc.h"
 }
 
+#include "stubs/bf_intern_eigen_stubs.h"
+
 /* -------------------------------------------------------------------- */
 /* Helper Functions */
 
index cd15a4eb8ff16be9f70b4ac7baf3f7f068a78c2e..92e2532392e674fda0cb60ea5b4fd5ab931d1a6d 100644 (file)
@@ -4,6 +4,8 @@
 
 #include "BLI_math.h"
 
+#include "stubs/bf_intern_eigen_stubs.h"
+
 TEST(math_geom, DistToLine2DSimple)
 {
        float p[2] = {5.0f, 1.0f},
index 5d112751fa02e1fdf34bd094716af71be90c78e8..eefcdd6e85e232d27038ce774d648e72118773bc 100644 (file)
@@ -27,6 +27,8 @@ extern "C" {
 #endif
 }
 
+#include "stubs/bf_intern_eigen_stubs.h"
+
 static void polyfill_to_obj(
         const char *id,
         const float poly[][2], const unsigned int poly_tot,
index 8b013e7a7a60478ce9e2d315f4c5c4d99da0b8cc..ffdb8d08d314bb3a94ec5c87bb729045d07aade2 100644 (file)
@@ -34,24 +34,27 @@ include_directories(${INC})
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
 
+if(WIN32)
+       set(BLI_path_util_extra_libs "bf_blenlib;bf_intern_utfconv;extern_wcwidth;${ZLIB_LIBRARIES}")
+else()
+       set(BLI_path_util_extra_libs "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}")
+endif()
 
 BLENDER_TEST(BLI_array_store "bf_blenlib")
 BLENDER_TEST(BLI_array_utils "bf_blenlib")
-BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_eigen")
-BLENDER_TEST(BLI_stack "bf_blenlib")
-BLENDER_TEST(BLI_math_color "bf_blenlib")
-BLENDER_TEST(BLI_math_geom "bf_blenlib;bf_intern_eigen")
+BLENDER_TEST(BLI_ghash "bf_blenlib")
+BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
+BLENDER_TEST(BLI_kdopbvh "bf_blenlib")
+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_path_util "${BLI_path_util_extra_libs}")
+BLENDER_TEST(BLI_polyfill2d "bf_blenlib")
+BLENDER_TEST(BLI_stack "bf_blenlib")
 BLENDER_TEST(BLI_string "bf_blenlib")
 BLENDER_TEST(BLI_string_utf8 "bf_blenlib")
-if(WIN32)
-       BLENDER_TEST(BLI_path_util "bf_blenlib;bf_intern_utfconv;extern_wcwidth;${ZLIB_LIBRARIES}")
-else()
-       BLENDER_TEST(BLI_path_util "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}")
-endif()
-BLENDER_TEST(BLI_polyfill2d "bf_blenlib;bf_intern_eigen")
-BLENDER_TEST(BLI_listbase "bf_blenlib")
-BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
-BLENDER_TEST(BLI_ghash "bf_blenlib")
 
 BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")
+
+unset(BLI_path_util_extra_libs)