Merge remote-tracking branch 'refs/remotes/origin/master'

Rhoana · Jan 23, 2019 · ed63089 · ed63089
2 parents edeb242 + 9bd5e01
commit ed63089
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/rh_renderer/blender/images_composer.pyxbld b/rh_renderer/blender/images_composer.pyxbld
@@ -10,6 +10,7 @@ flags = subprocess.check_output(['pkg-config', '--cflags-only-I', 'opencv'])
 include_dirs_list = [flag[2:] for flag in flags.split()]
 include_dirs_list.append('.')
 include_dirs_list.append(os.path.dirname(os.path.abspath(__file__)))
+include_dirs_list.append(numpy.get_include())
 flags = subprocess.check_output(['pkg-config', '--libs-only-L', 'opencv'])
 library_dirs_list = flags
 flags = subprocess.check_output(['pkg-config', '--libs', 'opencv'])

diff --git a/setup.py b/setup.py
@@ -4,6 +4,7 @@
 from setuptools.extension import Extension
 from Cython.Build import cythonize
 import subprocess
+import numpy as np
 
 VERSION = '0.0.5'
 
@@ -12,7 +13,7 @@
 flags = subprocess.check_output(['pkg-config', '--cflags-only-I', 'opencv'])
 include_dirs_list = [str(flag[2:].decode('utf-8')) for flag in flags.split()]
 include_dirs_list.append('.')
-#include_dirs_list.append(np.get_include())
+include_dirs_list.append(np.get_include())
 flags = subprocess.check_output(['pkg-config', '--libs-only-L', 'opencv'])
 library_dirs_list = flags
 flags = subprocess.check_output(['pkg-config', '--libs', 'opencv'])