Merge pull request #338 from 2bits/darwinLibzip

SConstruct: find Libzip on Darwin, Thanks 2bits
This commit is contained in:
Project OSRM 2012-07-16 04:44:24 -07:00
commit 1b98bd2c68

View File

@ -90,6 +90,7 @@ if sys.platform == 'darwin': #Mac OS X
boost_prefix = subprocess.check_output(["brew", "--prefix", "boost"]).strip() boost_prefix = subprocess.check_output(["brew", "--prefix", "boost"]).strip()
env.Append(CPPPATH = [boost_prefix+"/include"] ) env.Append(CPPPATH = [boost_prefix+"/include"] )
env.Append(LIBPATH = [boost_prefix+"/lib"] ) env.Append(LIBPATH = [boost_prefix+"/lib"] )
env.ParseConfig('pkg-config --cflags --libs libzip')
elif sys.platform.startswith("freebsd"): elif sys.platform.startswith("freebsd"):
env.ParseConfig('pkg-config --cflags --libs protobuf') env.ParseConfig('pkg-config --cflags --libs protobuf')
env.Append(CPPPATH = ['/usr/local/include', '/usr/local/include/libxml2']) env.Append(CPPPATH = ['/usr/local/include', '/usr/local/include/libxml2'])