Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor

1 files changed, 38 insertions, 1 deletions

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index e599b00401a..a5af517ecca 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -37,6 +37,7 @@ set(INC_SYS
 set(SRC
   intern/BLI_args.c
   intern/BLI_array.c
+  intern/BLI_assert.c
   intern/BLI_dial_2d.c
   intern/BLI_dynstr.c
   intern/BLI_filelist.c
@@ -86,6 +87,7 @@ set(SRC
   intern/listbase.c
   intern/math_base.c
   intern/math_base_inline.c
+  intern/math_base_safe_inline.c
   intern/math_bits_inline.c
   intern/math_color.c
   intern/math_color_blend_inline.c
@@ -105,10 +107,11 @@ set(SRC
   intern/polyfill_2d.c
   intern/polyfill_2d_beautify.c
   intern/quadric.c
-  intern/rand.c
+  intern/rand.cc
   intern/rct.c
   intern/scanfill.c
   intern/scanfill_utils.c
+  intern/session_uuid.c
   intern/smallhash.c
   intern/sort.c
   intern/sort_utils.c
@@ -163,6 +166,7 @@ set(SRC
   BLI_convexhull_2d.h
   BLI_delaunay_2d.h
   BLI_dial_2d.h
+  BLI_disjoint_set.hh
   BLI_dlrbTree.h
   BLI_dot_export.hh
   BLI_dot_export_attribute_enums.hh
@@ -197,6 +201,7 @@ set(SRC
   BLI_kdtree.h
   BLI_kdtree_impl.h
   BLI_lasso_2d.h
+  BLI_linear_allocator.hh
   BLI_link_utils.h
   BLI_linklist.h
   BLI_linklist_lockfree.h
@@ -207,6 +212,7 @@ set(SRC
   BLI_map_slots.hh
   BLI_math.h
   BLI_math_base.h
+  BLI_math_base_safe.h
   BLI_math_bits.h
   BLI_math_color.h
   BLI_math_color_blend.h
@@ -231,8 +237,11 @@ set(SRC
   BLI_probing_strategies.hh
   BLI_quadric.h
   BLI_rand.h
+  BLI_rand.hh
   BLI_rect.h
+  BLI_resource_collector.hh
   BLI_scanfill.h
+  BLI_session_uuid.h
   BLI_set.hh
   BLI_set_slots.hh
   BLI_smallhash.h
@@ -261,6 +270,7 @@ set(SRC
   BLI_utility_mixins.hh
   BLI_uvproject.h
   BLI_vector.hh
+  BLI_vector_adaptor.hh
   BLI_vector_set.hh
   BLI_vector_set_slots.hh
   BLI_vfontdata.h
@@ -324,6 +334,7 @@ endif()
 # no need to compile object files for inline headers.
 set_source_files_properties(
   intern/math_base_inline.c
+  intern/math_base_safe_inline.c
   intern/math_bits_inline.c
   intern/math_color_blend_inline.c
   intern/math_color_inline.c
@@ -333,3 +344,29 @@ set_source_files_properties(
 )
 
 blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+
+if(WITH_GTESTS)
+  set(TEST_SRC
+    tests/BLI_array_test.cc
+    tests/BLI_disjoint_set_test.cc
+    tests/BLI_edgehash_test.cc
+    tests/BLI_index_mask_test.cc
+    tests/BLI_index_range_test.cc
+    tests/BLI_linear_allocator_test.cc
+    tests/BLI_map_test.cc
+    tests/BLI_math_base_safe_test.cc
+    tests/BLI_memory_utils_test.cc
+    tests/BLI_multi_value_map_test.cc
+    tests/BLI_set_test.cc
+    tests/BLI_span_test.cc
+    tests/BLI_stack_cxx_test.cc
+    tests/BLI_string_ref_test.cc
+    tests/BLI_vector_set_test.cc
+    tests/BLI_vector_test.cc
+  )
+  set(TEST_LIB
+    bf_blenlib
+  )
+  include(GTestTesting)
+  blender_add_test_lib(bf_bli_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
+endif()