[Bf-blender-cvs] [a252a2d] libmv_prediction: Merge branch 'master' into libmv_prediction

[Sergey Sharybin]

Commit: a252a2d5c9a204a24929f5cfaae52a74f443be6a
Author: Sergey Sharybin
Date:   Sat Sep 27 15:42:14 2014 +0600
Branches: libmv_prediction
https://developer.blender.org/rBa252a2d5c9a204a24929f5cfaae52a74f443be6a

Merge branch 'master' into libmv_prediction

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



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

diff --cc extern/libmv/CMakeLists.txt
index 283aed8,09c36fc..3b7e689
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@@ -64,9 -64,9 +64,9 @@@ if(WITH_LIBMV
  		../../intern/guardedalloc
  	)
  
- 	set(INC_SYS
+ 	list(APPEND INC_SYS
  		../Eigen3
 -		${PNG_INCLUDE_DIRS}
 +		${PNG_INCLUDE_DIR}
  		${ZLIB_INCLUDE_DIRS}
  	)