[Bf-blender-cvs] [8f6b5f1f3c2] master: Fix CMake dependencies builder issues on Linux with TBB and Python packages.

[Brecht Van Lommel]

Commit: 8f6b5f1f3c2af33b7aba342eca221edd096d9a9e
Author: Brecht Van Lommel
Date:   Tue Aug 8 02:32:01 2017 +0200
Branches: master
https://developer.blender.org/rB8f6b5f1f3c2af33b7aba342eca221edd096d9a9e

Fix CMake dependencies builder issues on Linux with TBB and Python packages.

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

M	build_files/build_environment/cmake/harvest.cmake
M	build_files/build_environment/cmake/openvdb.cmake

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

diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 367bc7b45db..dfdfe50ab49 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -228,6 +228,7 @@ harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
 harvest(glew/include glew/include "*.h")
 harvest(glew/lib glew/lib "*.a")
 harvest(ilmbase openexr "*")
+harvest(ilmbase/include openexr/include "*.h")
 harvest(jemalloc/include jemalloc/include "*.h")
 harvest(jemalloc/lib jemalloc/lib "*.a")
 harvest(jpg/include jpeg/include "*.h")
@@ -266,14 +267,17 @@ harvest(png/include png/include "*.h")
 harvest(png/lib png/lib "*.a")
 harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
 harvest(python/include python/include "*h")
-harvest(python/lib/libpython${PYTHON_SHORT_VERSION}m.a python/lib/python${PYTHON_SHORT_VERSION}/libpython${PYTHON_SHORT_VERSION}m.a)
 if(UNIX AND NOT APPLE)
+	harvest(python/lib/libpython${PYTHON_SHORT_VERSION}m.a python/lib/libpython${PYTHON_SHORT_VERSION}m.a)
 	harvest(python/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*")
+	harvest(requests python/lib/python${PYTHON_SHORT_VERSION}/site-packages/requests "*")
+	harvest(numpy python/lib/python${PYTHON_SHORT_VERSION}/site-packages/numpy "*")
 else()
+	harvest(python/lib/libpython${PYTHON_SHORT_VERSION}m.a python/lib/python${PYTHON_SHORT_VERSION}/libpython${PYTHON_SHORT_VERSION}m.a)
 	harvest(python/release release "*")
+	harvest(requests release/site-packages/requests "*")
+	harvest(numpy release/site-packages/numpy "*")
 endif()
-harvest(requests release/site-packages/requests "*")
-harvest(numpy release/site-packages/numpy "*")
 harvest(schroedinger/lib/libschroedinger-1.0.a ffmpeg/lib/libschroedinger.a)
 harvest(sdl/include/SDL2 sdl/include "*.h")
 harvest(sdl/lib sdl/lib "libSDL2.a")
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake
index bf9ad9ca410..a71598c1a3b 100644
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -36,6 +36,7 @@ set(OPENVDB_EXTRA_ARGS
 	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
 	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
 	-DTBB_ROOT_DIR=${LIBDIR}/tbb/
+	-DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
 	-DTBB_LIBRARY=${LIBDIR}/tbb/lib/tbb_static${LIBEXT}
 	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
 	-DBoost_USE_MULTITHREADED=ON