Skip to content
Snippets Groups Projects
Commit c8d2814d authored by Donald Stufft's avatar Donald Stufft
Browse files

Use the generated include files

parent 7c0edf75
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,7 @@ import subprocess ...@@ -20,6 +20,7 @@ import subprocess
import sys import sys
from distutils.command.build_clib import build_clib as _build_clib from distutils.command.build_clib import build_clib as _build_clib
from distutils.command.build_ext import build_ext as _build_ext
from setuptools import Distribution, setup from setuptools import Distribution, setup
...@@ -64,7 +65,6 @@ except ImportError: ...@@ -64,7 +65,6 @@ except ImportError:
else: else:
# building bdist - cffi is here! # building bdist - cffi is here!
ext_modules = [nacl.nacl.ffi.verifier.get_extension()] ext_modules = [nacl.nacl.ffi.verifier.get_extension()]
ext_modules[0].include_dirs.append(sodium("include"))
class Distribution(Distribution): class Distribution(Distribution):
...@@ -122,6 +122,17 @@ class build_clib(_build_clib): ...@@ -122,6 +122,17 @@ class build_clib(_build_clib):
) )
class build_ext(_build_ext):
def run(self):
build_clib = self.get_finalized_command("build_clib")
self.include_dirs.append(
os.path.join(build_clib.build_clib, "include")
)
return _build_ext.run(self)
setup( setup(
name=nacl.__title__, name=nacl.__title__,
version=nacl.__version__, version=nacl.__version__,
...@@ -156,6 +167,7 @@ setup( ...@@ -156,6 +167,7 @@ setup(
cmdclass={ cmdclass={
"build_clib": build_clib, "build_clib": build_clib,
"build_ext": build_ext,
}, },
distclass=Distribution, distclass=Distribution,
zip_safe=False, zip_safe=False,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment