[Bf-blender-cvs] [971ad95f2ba] functions: solve merge conflicts
Jacques Lucke
noreply at git.blender.org
Thu Sep 12 14:59:22 CEST 2019
Commit: 971ad95f2bac3f2d141693bfcc7c6b190db43344
Author: Jacques Lucke
Date: Thu Sep 12 14:59:16 2019 +0200
Branches: functions
https://developer.blender.org/rB971ad95f2bac3f2d141693bfcc7c6b190db43344
solve merge conflicts
===================================================================
M source/blender/blenlib/CMakeLists.txt
M tests/gtests/blenlib/CMakeLists.txt
===================================================================
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 37feda15a56..573531d512b 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -248,33 +248,22 @@ set(SRC
PIL_time.h
PIL_time_utildefines.h
- BLI_array_cxx.h
- BLI_array_ref.h
BLI_chained_strings.h
BLI_lazy_init.h
BLI_lazy_init_cxx.h
intern/BLI_lazy_init.cc
- BLI_listbase_wrapper.h
BLI_math_cxx.h
BLI_monotonic_allocator.h
BLI_object_pool.h
BLI_optional.h
- BLI_index_range.h
- intern/BLI_index_range.cc
BLI_refcount.h
- BLI_vector.h
BLI_map.h
- BLI_memory_utils_cxx.h
BLI_multi_map.h
BLI_set.h
BLI_set_vector.h
- BLI_stack_cxx.h
BLI_chunked_range.h
BLI_string_map.h
BLI_string_ref.h
- BLI_temporary_allocator.h
- BLI_temporary_allocator_cxx.h
- intern/BLI_temporary_allocator.cc
BLI_timeit.h
BLI_vector_adaptor.h
BLI_multi_vector.h
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index 9810ccfd3c1..36d2a83fd8a 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -39,7 +39,6 @@ else()
endif()
BLENDER_TEST(BLI_array "bf_blenlib")
-BLENDER_TEST(BLI_array_ref "bf_blenlib")
BLENDER_TEST(BLI_array_store "bf_blenlib")
BLENDER_TEST(BLI_array_utils "bf_blenlib")
BLENDER_TEST(BLI_array_ref "bf_blenlib")
@@ -67,7 +66,6 @@ BLENDER_TEST(BLI_optional "bf_blenlib")
BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
BLENDER_TEST(BLI_refcount "bf_blenlib")
-BLENDER_TEST(BLI_vector "bf_blenlib")
BLENDER_TEST(BLI_set "bf_blenlib")
BLENDER_TEST(BLI_set_vector "bf_blenlib")
BLENDER_TEST(BLI_stack_cpp "bf_blenlib")
@@ -81,6 +79,7 @@ BLENDER_TEST(BLI_string_ref "bf_blenlib")
BLENDER_TEST(BLI_string_utf8 "bf_blenlib")
BLENDER_TEST(BLI_task "bf_blenlib;bf_intern_numaapi")
BLENDER_TEST(BLI_vector "bf_blenlib")
+BLENDER_TEST(BLI_vector_adaptor "bf_blenlib")
BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")
BLENDER_TEST_PERFORMANCE(BLI_task_performance "bf_blenlib")
More information about the Bf-blender-cvs
mailing list