[Bf-blender-cvs] [4939769cd6b] master: Build environment: Tweak to harvasting script

[Sergey Sharybin]

Commit: 4939769cd6be8eec3992c9d592145319fa0abe2e
Author: Sergey Sharybin
Date:   Thu Aug 30 10:21:51 2018 +0200
Branches: master
https://developer.blender.org/rB4939769cd6be8eec3992c9d592145319fa0abe2e

Build environment: Tweak to harvasting script

The idea is to make find_package() to succeed without any
extra tips given. For this, we need header files to be
harvasted.

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

M	build_files/build_environment/cmake/harvest.cmake

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

diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index e79bab3354a..d47a5e65d3c 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -110,7 +110,6 @@ endfunction()
 
 harvest(alembic/include alembic/include "*.h")
 harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
-harvest(blosc/lib openvdb/lib "*.a")
 harvest(boost/include boost/include "*")
 harvest(boost/lib boost/lib "*.a")
 harvest(ffmpeg/include ffmpeg/include "*.h")
@@ -135,6 +134,18 @@ harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
 	harvest(openal/lib openal/lib "*.a")
+
+	harvest(blosc/include blosc/include "*.h")
+	harvest(blosc/lib blosc/lib "*.a")
+
+	harvest(zlib/include zlib/include "*.h")
+	harvest(zlib/lib zlib/lib "*.a")
+
+	harvest(xml2/include xml2/include "*.h")
+	harvest(xml2/lib xml2/lib "*.a")
+else()
+	harvest(blosc/lib openvdb/lib "*.a")
+	harvest(xml2/lib opencollada/lib "*.a")
 endif()
 harvest(opencollada/include/opencollada opencollada/include "*.h")
 harvest(opencollada/lib/opencollada opencollada/lib "*.a")
@@ -178,7 +189,6 @@ harvest(vorbis/lib ffmpeg/lib "*.a")
 harvest(vpx/lib ffmpeg/lib "*.a")
 harvest(webp/lib ffmpeg/lib "*.a")
 harvest(x264/lib ffmpeg/lib "*.a")
-harvest(xml2/lib opencollada/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
 
 endif()