Getting rid of third party dependency for boost_program_options part 2

This commit is contained in:
Dennis Luxen 2011-03-11 16:53:30 +00:00
parent a2b096b096
commit dae3152c9c

View File

@ -33,7 +33,7 @@ else: #Mac OS X
if GetOption('buildconfiguration') == 'debug': if GetOption('buildconfiguration') == 'debug':
env.Append(CCFLAGS = ' -Wall -g3') env.Append(CCFLAGS = ' -Wall -g3')
else: else:
env.Append(CCFLAGS = ' -O3 -DNDEBUG') env.Append(CCFLAGS = ' -O3 -DNDEBUG -march=native')
#print "Compiling with: ", env['CXX'] #print "Compiling with: ", env['CXX']
conf = Configure(env) conf = Configure(env)
if not conf.CheckHeader('omp.h'): if not conf.CheckHeader('omp.h'):
@ -80,15 +80,14 @@ if not conf.CheckCXXHeader('boost/noncopyable.hpp'):
if not conf.CheckCXXHeader('boost/shared_ptr.hpp'): if not conf.CheckCXXHeader('boost/shared_ptr.hpp'):
print "boost/shared_ptr.hpp not found. Exiting" print "boost/shared_ptr.hpp not found. Exiting"
Exit(-1) Exit(-1)
if not conf.CheckCXXHeader('boost/program_options.hpp'):
print "boost/shared_ptr.hpp not found. Exiting"
Exit(-1)
if not conf.CheckLibWithHeader('stxxl', 'stxxl.h', 'CXX'): if not conf.CheckLibWithHeader('stxxl', 'stxxl.h', 'CXX'):
print "stxxl library not found. Exiting" print "stxxl library not found. Exiting"
Exit(-1) Exit(-1)
if not conf.CheckLibWithHeader('protobuf', 'google/protobuf/descriptor.h', 'CXX'): if not conf.CheckLibWithHeader('protobuf', 'google/protobuf/descriptor.h', 'CXX'):
print "Google Protobuffer library not found. Exiting" print "Google Protobuffer library not found. Exiting"
Exit(-1) Exit(-1)
#if os.sysconf('SC_NPROCESSORS_ONLN') > 1:
# env.Append(CCFLAGS = ' -D_GLIBCXX_PARALLEL');
env.Append(CCFLAGS = ' -fopenmp') env.Append(CCFLAGS = ' -fopenmp')
env.Append(LINKFLAGS = ' -fopenmp') env.Append(LINKFLAGS = ' -fopenmp')
@ -100,7 +99,7 @@ env.Program("createHierarchy.cpp")
if os.path.exists("many-to-many.cpp"): if os.path.exists("many-to-many.cpp"):
env.Program("many-to-many.cpp") env.Program("many-to-many.cpp")
env.Append(CCFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system -lbz2 -lz -lprotobuf') env.Append(CCFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system -lbz2 -lz -lprotobuf')
env.Append(LINKFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system -lbz2 -lz -lboost_program_options') env.Append(LINKFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system -lbz2 -lz')
env.Append(LINKFLAGS = ' -lprotobuf DataStructures/pbf-proto/fileformat.pb.o DataStructures/pbf-proto/osmformat.pb.o') env.Append(LINKFLAGS = ' -lprotobuf DataStructures/pbf-proto/fileformat.pb.o DataStructures/pbf-proto/osmformat.pb.o')
env.Program("routed.cpp") env.Program("routed.cpp")
env = conf.Finish() env = conf.Finish()