Commit 6cc80fd5 authored by Alex Hornby's avatar Alex Hornby Committed by Facebook GitHub Bot

populate THRIFT_INCLUDE_PATH

Summary:
Populate the new environment variable if relevant path for it found.

For the OSS getdeps builds of things depending on fb303 this will allow them to be able to be able to find the fb303 thrift files from the declared fb303 dependency, rather than needing duplicates/stubs inside each package.

Also adds python as dependency to fbthrift manifest,  found it needed it when testing

Reviewed By: HarveyHunt

Differential Revision: D33771979

fbshipit-source-id: 9635221c0e6a2ac225d7d0babe76f1c919b583de
parent e77f06df
...@@ -240,6 +240,11 @@ class BuildOptions(object): ...@@ -240,6 +240,11 @@ class BuildOptions(object):
add_path_entry(env, "CMAKE_PREFIX_PATH", d) add_path_entry(env, "CMAKE_PREFIX_PATH", d)
# Tell the thrift compiler about includes it needs to consider
thriftdir = os.path.join(d, "include/thrift-files")
if os.path.exists(thriftdir):
add_path_entry(env, "THRIFT_INCLUDE_PATH", thriftdir)
# Allow resolving shared objects built earlier (eg: zstd # Allow resolving shared objects built earlier (eg: zstd
# doesn't include the full path to the dylib in its linkage # doesn't include the full path to the dylib in its linkage
# so we need to give it an assist) # so we need to give it an assist)
......
...@@ -19,6 +19,7 @@ fizz ...@@ -19,6 +19,7 @@ fizz
fmt fmt
googletest googletest
libsodium libsodium
python
python-six python-six
zstd zstd
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment