Fix CMake dependencies builder issues on Linux with TBB and Python packages.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 8 Aug 2017 00:32:01 +0000 (02:32 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 8 Aug 2017 00:33:37 +0000 (02:33 +0200)
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/openvdb.cmake

index 367bc7b45dbe44e9cd031a2a11ebbd6e91728fd3..dfdfe50ab493a21b10a97ce6f642e5f389273e9c 100644 (file)
@@ -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")
index bf9ad9ca410d2154954d6e71b7b9befd13ac95b4..a71598c1a3b1c41d1475edf3de00d4845e260499 100644 (file)
@@ -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