[Bf-blender-cvs] [a628f1842b2] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: a628f1842b216254a07b8f12eed4eba9c13f0a32
Author: Jacques Lucke
Date:   Mon Apr 15 10:24:47 2019 +0200
Branches: functions
https://developer.blender.org/rBa628f1842b216254a07b8f12eed4eba9c13f0a32

Merge branch 'master' into functions

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



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

diff --cc source/blender/blenlib/CMakeLists.txt
index 79cde43d399,18332f5ddea..33ddf9367f4
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@@ -231,25 -231,11 +231,28 @@@ set(SR
  	BLI_winstuff.h
  	PIL_time.h
  	PIL_time_utildefines.h
 +
 +	BLI_array_lookup.hpp
 +	BLI_array_ref.hpp
 +	BLI_composition.hpp
 +	BLI_lazy_init.hpp
 +	BLI_listbase_wrapper.hpp
 +	BLI_mempool.hpp
 +	BLI_multimap.hpp
 +	BLI_multipool.hpp
 +	BLI_optional.hpp
 +	BLI_shared.hpp
 +	BLI_small_vector.hpp
 +	BLI_small_map.hpp
 +	BLI_small_set.hpp
 +	BLI_small_set_vector.hpp
 +	BLI_small_stack.hpp
 +	BLI_timeit.hpp
  )
  
+ set(LIB
+ )
+ 
  if(WITH_MEM_VALGRIND)
  	add_definitions(-DWITH_MEM_VALGRIND)
  endif()